database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge InnoDB 5.7 from mysql-5.7.9.

Browse Source 
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:
Jan Lindström
2016-08-12 11:17:45 +03:00
parent 848d211c5c
commit 2e814d4702
835 changed files with 174739 additions and 84445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test
View File

@ -18,19 +18,40 @@ select @@global.innodb_replication_delay;
select @@session.innodb_replication_delay;
show global variables like 'innodb_replication_delay';
show session variables like 'innodb_replication_delay';
--disable_warnings
select * from information_schema.global_variables where variable_name='innodb_replication_delay';
select * from information_schema.session_variables where variable_name='innodb_replication_delay';
--enable_warnings
#
# show that it's writable
#
set global innodb_replication_delay=10;
select @@global.innodb_replication_delay;
--disable_warnings
select * from information_schema.global_variables where variable_name='innodb_replication_delay';
select * from information_schema.session_variables where variable_name='innodb_replication_delay';
--enable_warnings
--error ER_GLOBAL_VARIABLE
set session innodb_replication_delay=1;
#
# check the default value
#
set global innodb_replication_delay=DEFAULT;
select @@global.innodb_replication_delay;
#
# valid values
#
set global innodb_replication_delay=0;
select @@global.innodb_replication_delay;
set global innodb_replication_delay=65535;
select @@global.innodb_replication_delay;
set global innodb_replication_delay=4294967295;
select @@global.innodb_replication_delay;
#
# incorrect types
#
@ -40,10 +61,39 @@ set global innodb_replication_delay=1.1;
set global innodb_replication_delay=1e1;
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_replication_delay="foo";
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_replication_delay=' ';
select @@global.innodb_replication_delay;
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_replication_delay=" ";
select @@global.innodb_replication_delay;
set global innodb_replication_delay=-7;
select @@global.innodb_replication_delay;
set global innodb_replication_delay=-1024;
select @@global.innodb_replication_delay;
--disable_warnings
select * from information_schema.global_variables where variable_name='innodb_replication_delay';
--enable_warnings
#
# Check for out of bounds
#
# With a 64 bit mysqld:18446744073709551615,with a 32 bit mysqld: 4294967295
--disable_warnings
SET @@global.innodb_replication_delay = 4294967296;
--enable_warnings
SELECT @@global.innodb_replication_delay IN (4294967296,4294967295);
--disable_warnings
SET @@global.innodb_replication_delay = 12345678901;
--enable_warnings
SELECT @@global.innodb_replication_delay IN (12345678901,4294967295);
--disable_warnings
SET @@global.innodb_replication_delay = 18446744073709551615;
--enable_warnings
SELECT @@global.innodb_replication_delay IN (18446744073709551615,4294967295);
#
# cleanup