Skip to content

Commit 8e6a72b

Browse files
author
Guilhem Bichot
committed
merge with latest next-mr-bugfixing
2 parents ccc354c + 76fa370 commit 8e6a72b

File tree

94 files changed

+3471
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3471
-159
lines changed

‎mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
SET @start_global_value = @@global.innodb_adaptive_flushing;
2+
SELECT @start_global_value;
3+
@start_global_value
4+
1
5+
Valid values are 'ON' and 'OFF'
6+
select @@global.innodb_adaptive_flushing in (0, 1);
7+
@@global.innodb_adaptive_flushing in (0, 1)
8+
1
9+
select @@global.innodb_adaptive_flushing;
10+
@@global.innodb_adaptive_flushing
11+
1
12+
select @@session.innodb_adaptive_flushing;
13+
ERROR HY000: Variable 'innodb_adaptive_flushing' is a GLOBAL variable
14+
show global variables like 'innodb_adaptive_flushing';
15+
Variable_name Value
16+
innodb_adaptive_flushing ON
17+
show session variables like 'innodb_adaptive_flushing';
18+
Variable_name Value
19+
innodb_adaptive_flushing ON
20+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
21+
VARIABLE_NAME VARIABLE_VALUE
22+
INNODB_ADAPTIVE_FLUSHING ON
23+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
24+
VARIABLE_NAME VARIABLE_VALUE
25+
INNODB_ADAPTIVE_FLUSHING ON
26+
set global innodb_adaptive_flushing='OFF';
27+
select @@global.innodb_adaptive_flushing;
28+
@@global.innodb_adaptive_flushing
29+
0
30+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
31+
VARIABLE_NAME VARIABLE_VALUE
32+
INNODB_ADAPTIVE_FLUSHING OFF
33+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
34+
VARIABLE_NAME VARIABLE_VALUE
35+
INNODB_ADAPTIVE_FLUSHING OFF
36+
set @@global.innodb_adaptive_flushing=1;
37+
select @@global.innodb_adaptive_flushing;
38+
@@global.innodb_adaptive_flushing
39+
1
40+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
41+
VARIABLE_NAME VARIABLE_VALUE
42+
INNODB_ADAPTIVE_FLUSHING ON
43+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
44+
VARIABLE_NAME VARIABLE_VALUE
45+
INNODB_ADAPTIVE_FLUSHING ON
46+
set global innodb_adaptive_flushing=0;
47+
select @@global.innodb_adaptive_flushing;
48+
@@global.innodb_adaptive_flushing
49+
0
50+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
51+
VARIABLE_NAME VARIABLE_VALUE
52+
INNODB_ADAPTIVE_FLUSHING OFF
53+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
54+
VARIABLE_NAME VARIABLE_VALUE
55+
INNODB_ADAPTIVE_FLUSHING OFF
56+
set @@global.innodb_adaptive_flushing='ON';
57+
select @@global.innodb_adaptive_flushing;
58+
@@global.innodb_adaptive_flushing
59+
1
60+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
61+
VARIABLE_NAME VARIABLE_VALUE
62+
INNODB_ADAPTIVE_FLUSHING ON
63+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
64+
VARIABLE_NAME VARIABLE_VALUE
65+
INNODB_ADAPTIVE_FLUSHING ON
66+
set session innodb_adaptive_flushing='OFF';
67+
ERROR HY000: Variable 'innodb_adaptive_flushing' is a GLOBAL variable and should be set with SET GLOBAL
68+
set @@session.innodb_adaptive_flushing='ON';
69+
ERROR HY000: Variable 'innodb_adaptive_flushing' is a GLOBAL variable and should be set with SET GLOBAL
70+
set global innodb_adaptive_flushing=1.1;
71+
ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_flushing'
72+
set global innodb_adaptive_flushing=1e1;
73+
ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_flushing'
74+
set global innodb_adaptive_flushing=2;
75+
ERROR 42000: Variable 'innodb_adaptive_flushing' can't be set to the value of '2'
76+
NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
77+
set global innodb_adaptive_flushing=-3;
78+
select @@global.innodb_adaptive_flushing;
79+
@@global.innodb_adaptive_flushing
80+
1
81+
select * from information_schema.global_variables where variable_name='innodb_adaptive_flushing';
82+
VARIABLE_NAME VARIABLE_VALUE
83+
INNODB_ADAPTIVE_FLUSHING ON
84+
select * from information_schema.session_variables where variable_name='innodb_adaptive_flushing';
85+
VARIABLE_NAME VARIABLE_VALUE
86+
INNODB_ADAPTIVE_FLUSHING ON
87+
set global innodb_adaptive_flushing='AUTO';
88+
ERROR 42000: Variable 'innodb_adaptive_flushing' can't be set to the value of 'AUTO'
89+
SET @@global.innodb_adaptive_flushing = @start_global_value;
90+
SELECT @@global.innodb_adaptive_flushing;
91+
@@global.innodb_adaptive_flushing
92+
1

‎mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
SET @start_global_value = @@global.innodb_adaptive_hash_index;
2+
SELECT @start_global_value;
3+
@start_global_value
4+
1
5+
Valid values are 'ON' and 'OFF'
6+
select @@global.innodb_adaptive_hash_index in (0, 1);
7+
@@global.innodb_adaptive_hash_index in (0, 1)
8+
1
9+
select @@global.innodb_adaptive_hash_index;
10+
@@global.innodb_adaptive_hash_index
11+
1
12+
select @@session.innodb_adaptive_hash_index;
13+
ERROR HY000: Variable 'innodb_adaptive_hash_index' is a GLOBAL variable
14+
show global variables like 'innodb_adaptive_hash_index';
15+
Variable_name Value
16+
innodb_adaptive_hash_index ON
17+
show session variables like 'innodb_adaptive_hash_index';
18+
Variable_name Value
19+
innodb_adaptive_hash_index ON
20+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
21+
VARIABLE_NAME VARIABLE_VALUE
22+
INNODB_ADAPTIVE_HASH_INDEX ON
23+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
24+
VARIABLE_NAME VARIABLE_VALUE
25+
INNODB_ADAPTIVE_HASH_INDEX ON
26+
set global innodb_adaptive_hash_index='OFF';
27+
select @@global.innodb_adaptive_hash_index;
28+
@@global.innodb_adaptive_hash_index
29+
0
30+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
31+
VARIABLE_NAME VARIABLE_VALUE
32+
INNODB_ADAPTIVE_HASH_INDEX OFF
33+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
34+
VARIABLE_NAME VARIABLE_VALUE
35+
INNODB_ADAPTIVE_HASH_INDEX OFF
36+
set @@global.innodb_adaptive_hash_index=1;
37+
select @@global.innodb_adaptive_hash_index;
38+
@@global.innodb_adaptive_hash_index
39+
1
40+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
41+
VARIABLE_NAME VARIABLE_VALUE
42+
INNODB_ADAPTIVE_HASH_INDEX ON
43+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
44+
VARIABLE_NAME VARIABLE_VALUE
45+
INNODB_ADAPTIVE_HASH_INDEX ON
46+
set global innodb_adaptive_hash_index=0;
47+
select @@global.innodb_adaptive_hash_index;
48+
@@global.innodb_adaptive_hash_index
49+
0
50+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
51+
VARIABLE_NAME VARIABLE_VALUE
52+
INNODB_ADAPTIVE_HASH_INDEX OFF
53+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
54+
VARIABLE_NAME VARIABLE_VALUE
55+
INNODB_ADAPTIVE_HASH_INDEX OFF
56+
set @@global.innodb_adaptive_hash_index='ON';
57+
select @@global.innodb_adaptive_hash_index;
58+
@@global.innodb_adaptive_hash_index
59+
1
60+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
61+
VARIABLE_NAME VARIABLE_VALUE
62+
INNODB_ADAPTIVE_HASH_INDEX ON
63+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
64+
VARIABLE_NAME VARIABLE_VALUE
65+
INNODB_ADAPTIVE_HASH_INDEX ON
66+
set session innodb_adaptive_hash_index='OFF';
67+
ERROR HY000: Variable 'innodb_adaptive_hash_index' is a GLOBAL variable and should be set with SET GLOBAL
68+
set @@session.innodb_adaptive_hash_index='ON';
69+
ERROR HY000: Variable 'innodb_adaptive_hash_index' is a GLOBAL variable and should be set with SET GLOBAL
70+
set global innodb_adaptive_hash_index=1.1;
71+
ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_hash_index'
72+
set global innodb_adaptive_hash_index=1e1;
73+
ERROR 42000: Incorrect argument type to variable 'innodb_adaptive_hash_index'
74+
set global innodb_adaptive_hash_index=2;
75+
ERROR 42000: Variable 'innodb_adaptive_hash_index' can't be set to the value of '2'
76+
NOTE: The following should fail with ER_WRONG_VALUE_FOR_VAR (BUG#50643)
77+
set global innodb_adaptive_hash_index=-3;
78+
select @@global.innodb_adaptive_hash_index;
79+
@@global.innodb_adaptive_hash_index
80+
1
81+
select * from information_schema.global_variables where variable_name='innodb_adaptive_hash_index';
82+
VARIABLE_NAME VARIABLE_VALUE
83+
INNODB_ADAPTIVE_HASH_INDEX ON
84+
select * from information_schema.session_variables where variable_name='innodb_adaptive_hash_index';
85+
VARIABLE_NAME VARIABLE_VALUE
86+
INNODB_ADAPTIVE_HASH_INDEX ON
87+
set global innodb_adaptive_hash_index='AUTO';
88+
ERROR 42000: Variable 'innodb_adaptive_hash_index' can't be set to the value of 'AUTO'
89+
SET @@global.innodb_adaptive_hash_index = @start_global_value;
90+
SELECT @@global.innodb_adaptive_hash_index;
91+
@@global.innodb_adaptive_hash_index
92+
1

‎mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
SET @start_global_value = @@global.innodb_change_buffering;
2+
SELECT @start_global_value;
3+
@start_global_value
4+
inserts
5+
Valid values are 'inserts' and 'none'
6+
select @@global.innodb_change_buffering in ('inserts', 'none');
7+
@@global.innodb_change_buffering in ('inserts', 'none')
8+
1
9+
select @@global.innodb_change_buffering;
10+
@@global.innodb_change_buffering
11+
inserts
12+
select @@session.innodb_change_buffering;
13+
ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable
14+
show global variables like 'innodb_change_buffering';
15+
Variable_name Value
16+
innodb_change_buffering inserts
17+
show session variables like 'innodb_change_buffering';
18+
Variable_name Value
19+
innodb_change_buffering inserts
20+
select * from information_schema.global_variables where variable_name='innodb_change_buffering';
21+
VARIABLE_NAME VARIABLE_VALUE
22+
INNODB_CHANGE_BUFFERING inserts
23+
select * from information_schema.session_variables where variable_name='innodb_change_buffering';
24+
VARIABLE_NAME VARIABLE_VALUE
25+
INNODB_CHANGE_BUFFERING inserts
26+
set global innodb_change_buffering='none';
27+
select @@global.innodb_change_buffering;
28+
@@global.innodb_change_buffering
29+
none
30+
select * from information_schema.global_variables where variable_name='innodb_change_buffering';
31+
VARIABLE_NAME VARIABLE_VALUE
32+
INNODB_CHANGE_BUFFERING none
33+
select * from information_schema.session_variables where variable_name='innodb_change_buffering';
34+
VARIABLE_NAME VARIABLE_VALUE
35+
INNODB_CHANGE_BUFFERING none
36+
set @@global.innodb_change_buffering='inserts';
37+
select @@global.innodb_change_buffering;
38+
@@global.innodb_change_buffering
39+
inserts
40+
select * from information_schema.global_variables where variable_name='innodb_change_buffering';
41+
VARIABLE_NAME VARIABLE_VALUE
42+
INNODB_CHANGE_BUFFERING inserts
43+
select * from information_schema.session_variables where variable_name='innodb_change_buffering';
44+
VARIABLE_NAME VARIABLE_VALUE
45+
INNODB_CHANGE_BUFFERING inserts
46+
set session innodb_change_buffering='some';
47+
ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable and should be set with SET GLOBAL
48+
set @@session.innodb_change_buffering='some';
49+
ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable and should be set with SET GLOBAL
50+
set global innodb_change_buffering=1.1;
51+
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering'
52+
set global innodb_change_buffering=1;
53+
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering'
54+
set global innodb_change_buffering=-2;
55+
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering'
56+
set global innodb_change_buffering=1e1;
57+
ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering'
58+
set global innodb_change_buffering='some';
59+
ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of 'some'
60+
SET @@global.innodb_change_buffering = @start_global_value;
61+
SELECT @@global.innodb_change_buffering;
62+
@@global.innodb_change_buffering
63+
inserts

‎mysql-test/suite/sys_vars/r/innodb_file_format_basic.result

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
SET @start_global_value = @@global.innodb_file_format;
2+
SELECT @start_global_value;
3+
@start_global_value
4+
Antelope
5+
Valid values are 'Antelope' and 'Barracuda'
6+
select @@global.innodb_file_format in ('Antelope', 'Barracuda');
7+
@@global.innodb_file_format in ('Antelope', 'Barracuda')
8+
1
9+
select @@global.innodb_file_format;
10+
@@global.innodb_file_format
11+
Antelope
12+
select @@session.innodb_file_format;
13+
ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable
14+
show global variables like 'innodb_file_format';
15+
Variable_name Value
16+
innodb_file_format Antelope
17+
show session variables like 'innodb_file_format';
18+
Variable_name Value
19+
innodb_file_format Antelope
20+
select * from information_schema.global_variables where variable_name='innodb_file_format';
21+
VARIABLE_NAME VARIABLE_VALUE
22+
INNODB_FILE_FORMAT Antelope
23+
select * from information_schema.session_variables where variable_name='innodb_file_format';
24+
VARIABLE_NAME VARIABLE_VALUE
25+
INNODB_FILE_FORMAT Antelope
26+
set global innodb_file_format='Antelope';
27+
select @@global.innodb_file_format;
28+
@@global.innodb_file_format
29+
Antelope
30+
select * from information_schema.global_variables where variable_name='innodb_file_format';
31+
VARIABLE_NAME VARIABLE_VALUE
32+
INNODB_FILE_FORMAT Antelope
33+
select * from information_schema.session_variables where variable_name='innodb_file_format';
34+
VARIABLE_NAME VARIABLE_VALUE
35+
INNODB_FILE_FORMAT Antelope
36+
set @@global.innodb_file_format='Barracuda';
37+
select @@global.innodb_file_format;
38+
@@global.innodb_file_format
39+
Barracuda
40+
select * from information_schema.global_variables where variable_name='innodb_file_format';
41+
VARIABLE_NAME VARIABLE_VALUE
42+
INNODB_FILE_FORMAT Barracuda
43+
select * from information_schema.session_variables where variable_name='innodb_file_format';
44+
VARIABLE_NAME VARIABLE_VALUE
45+
INNODB_FILE_FORMAT Barracuda
46+
set session innodb_file_format='Salmon';
47+
ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable and should be set with SET GLOBAL
48+
set @@session.innodb_file_format='Salmon';
49+
ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable and should be set with SET GLOBAL
50+
set global innodb_file_format=1.1;
51+
ERROR 42000: Incorrect argument type to variable 'innodb_file_format'
52+
set global innodb_file_format=1e1;
53+
ERROR 42000: Incorrect argument type to variable 'innodb_file_format'
54+
set global innodb_file_format='Salmon';
55+
ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Salmon'
56+
SET @@global.innodb_file_format = @start_global_value;
57+
SELECT @@global.innodb_file_format;
58+
@@global.innodb_file_format
59+
Antelope

‎mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
SET @start_global_value = @@global.innodb_file_format_check;
2+
SELECT @start_global_value;
3+
@start_global_value
4+
Antelope
5+
Valid values are 'Antelope' and 'Barracuda'
6+
select @@global.innodb_file_format_check in ('Antelope', 'Barracuda');
7+
@@global.innodb_file_format_check in ('Antelope', 'Barracuda')
8+
1
9+
select @@global.innodb_file_format_check;
10+
@@global.innodb_file_format_check
11+
Antelope
12+
select @@session.innodb_file_format_check;
13+
ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable
14+
show global variables like 'innodb_file_format_check';
15+
Variable_name Value
16+
innodb_file_format_check Antelope
17+
show session variables like 'innodb_file_format_check';
18+
Variable_name Value
19+
innodb_file_format_check Antelope
20+
select * from information_schema.global_variables where variable_name='innodb_file_format_check';
21+
VARIABLE_NAME VARIABLE_VALUE
22+
INNODB_FILE_FORMAT_CHECK Antelope
23+
select * from information_schema.session_variables where variable_name='innodb_file_format_check';
24+
VARIABLE_NAME VARIABLE_VALUE
25+
INNODB_FILE_FORMAT_CHECK Antelope
26+
set global innodb_file_format_check='Antelope';
27+
select @@global.innodb_file_format_check;
28+
@@global.innodb_file_format_check
29+
Antelope
30+
select * from information_schema.global_variables where variable_name='innodb_file_format_check';
31+
VARIABLE_NAME VARIABLE_VALUE
32+
INNODB_FILE_FORMAT_CHECK Antelope
33+
select * from information_schema.session_variables where variable_name='innodb_file_format_check';
34+
VARIABLE_NAME VARIABLE_VALUE
35+
INNODB_FILE_FORMAT_CHECK Antelope
36+
set @@global.innodb_file_format_check='Barracuda';
37+
select @@global.innodb_file_format_check;
38+
@@global.innodb_file_format_check
39+
Barracuda
40+
select * from information_schema.global_variables where variable_name='innodb_file_format_check';
41+
VARIABLE_NAME VARIABLE_VALUE
42+
INNODB_FILE_FORMAT_CHECK Barracuda
43+
select * from information_schema.session_variables where variable_name='innodb_file_format_check';
44+
VARIABLE_NAME VARIABLE_VALUE
45+
INNODB_FILE_FORMAT_CHECK Barracuda
46+
set session innodb_file_format_check='Salmon';
47+
ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable and should be set with SET GLOBAL
48+
set @@session.innodb_file_format_check='Salmon';
49+
ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable and should be set with SET GLOBAL
50+
set global innodb_file_format_check=1.1;
51+
ERROR 42000: Incorrect argument type to variable 'innodb_file_format_check'
52+
set global innodb_file_format_check=1e1;
53+
ERROR 42000: Incorrect argument type to variable 'innodb_file_format_check'
54+
set global innodb_file_format_check='Salmon';
55+
ERROR 42000: Variable 'innodb_file_format_check' can't be set to the value of 'Salmon'
56+
SET @@global.innodb_file_format_check = @start_global_value;
57+
SELECT @@global.innodb_file_format_check;
58+
@@global.innodb_file_format_check
59+
Antelope

0 commit comments

Comments
 (0)