Commit 1f847d16 authored by Patrick Crews's avatar Patrick Crews

Bug#41893: main.variables mysql-test fails in new variable like '%alloc%' is added.

Added ORDER BY clause to I_S query to ensure consistent order.
There were differences between 5.1 and 6.0 output.  Correcting it 5.1.
parent 87263436
...@@ -318,13 +318,13 @@ transaction_prealloc_size 4096 ...@@ -318,13 +318,13 @@ transaction_prealloc_size 4096
SELECT * FROM information_schema.session_variables SELECT * FROM information_schema.session_variables
WHERE variable_name IN ('range_alloc_block_size', WHERE variable_name IN ('range_alloc_block_size',
'query_alloc_block_size', 'query_prealloc_size', 'query_alloc_block_size', 'query_prealloc_size',
'transaction_alloc_block_size', 'transaction_prealloc_size'); 'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
QUERY_ALLOC_BLOCK_SIZE 8192
QUERY_PREALLOC_SIZE 8192
RANGE_ALLOC_BLOCK_SIZE 4096 RANGE_ALLOC_BLOCK_SIZE 4096
TRANSACTION_ALLOC_BLOCK_SIZE 8192 TRANSACTION_ALLOC_BLOCK_SIZE 8192
TRANSACTION_PREALLOC_SIZE 4096 TRANSACTION_PREALLOC_SIZE 4096
QUERY_PREALLOC_SIZE 8192
QUERY_ALLOC_BLOCK_SIZE 8192
Testing values that are multiples of 1024 Testing values that are multiples of 1024
set @@range_alloc_block_size=1024*15+1024; set @@range_alloc_block_size=1024*15+1024;
set @@query_alloc_block_size=1024*15+1024*2; set @@query_alloc_block_size=1024*15+1024*2;
......
...@@ -188,7 +188,7 @@ SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size', ...@@ -188,7 +188,7 @@ SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
SELECT * FROM information_schema.session_variables SELECT * FROM information_schema.session_variables
WHERE variable_name IN ('range_alloc_block_size', WHERE variable_name IN ('range_alloc_block_size',
'query_alloc_block_size', 'query_prealloc_size', 'query_alloc_block_size', 'query_prealloc_size',
'transaction_alloc_block_size', 'transaction_prealloc_size'); 'transaction_alloc_block_size', 'transaction_prealloc_size') ORDER BY 1;
--echo Testing values that are multiples of 1024 --echo Testing values that are multiples of 1024
set @@range_alloc_block_size=1024*15+1024; set @@range_alloc_block_size=1024*15+1024;
set @@query_alloc_block_size=1024*15+1024*2; set @@query_alloc_block_size=1024*15+1024*2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment