mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge InnoDB 5.7 from mysql-5.7.9.
Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge
This commit is contained in:
@ -13,28 +13,38 @@ select @@global.innodb_status_output;
|
||||
select @@session.innodb_status_output;
|
||||
show global variables like 'innodb_status_output';
|
||||
show session variables like 'innodb_status_output';
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
|
||||
#
|
||||
# show that it's writable
|
||||
#
|
||||
set global innodb_status_output='OFF';
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
set @@global.innodb_status_output=1;
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
set global innodb_status_output=0;
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
set @@global.innodb_status_output='ON';
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
--error ER_GLOBAL_VARIABLE
|
||||
set session innodb_status_output='OFF';
|
||||
--error ER_GLOBAL_VARIABLE
|
||||
@ -52,12 +62,16 @@ set global innodb_status_output=2;
|
||||
--error ER_WRONG_VALUE_FOR_VAR
|
||||
set global innodb_status_output=-3;
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
set global innodb_status_output=DEFAULT;
|
||||
select @@global.innodb_status_output;
|
||||
--disable_warnings
|
||||
select * from information_schema.global_variables where variable_name='innodb_status_output';
|
||||
select * from information_schema.session_variables where variable_name='innodb_status_output';
|
||||
--enable_warnings
|
||||
--error ER_WRONG_VALUE_FOR_VAR
|
||||
set global innodb_status_output='AUTO';
|
||||
|
||||
|
Reference in New Issue
Block a user