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

48
mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test
View File

@ -59,7 +59,6 @@ SELECT @@innodb_concurrency_tickets;
--Error ER_UNKNOWN_TABLE
SELECT local.innodb_concurrency_tickets;
SET global innodb_concurrency_tickets = 0;
SELECT @@global.innodb_concurrency_tickets;
@ -69,7 +68,6 @@ SELECT @@global.innodb_concurrency_tickets;
# change the value of innodb_concurrency_tickets to a valid value #
##########################################################################
SET @@global.innodb_concurrency_tickets = 1;
SELECT @@global.innodb_concurrency_tickets;
@ -79,15 +77,38 @@ SELECT @@global.innodb_concurrency_tickets;
SET @@global.innodb_concurrency_tickets = 4294967295;
SELECT @@global.innodb_concurrency_tickets;
--echo '#--------------------FN_DYNVARS_046_04-------------------------#'
###########################################################################
# Check the value of innodb_concurrency_tickets for out of bounds #
###########################################################################
# With a 64 bit mysqld:18446744073709551615,with a 32 bit mysqld: 4294967295
--disable_warnings
SET @@global.innodb_concurrency_tickets = 4294967296;
--enable_warnings
SELECT @@global.innodb_concurrency_tickets IN (4294967296,4294967295);
--disable_warnings
SET @@global.innodb_concurrency_tickets = 12345678901;
--enable_warnings
SELECT @@global.innodb_concurrency_tickets IN (12345678901,4294967295);
--disable_warnings
SET @@global.innodb_concurrency_tickets = 18446744073709551615;
--enable_warnings
SELECT @@global.innodb_concurrency_tickets IN (18446744073709551615,4294967295);
--echo '#--------------------FN_DYNVARS_046_05-------------------------#'
###########################################################################
# Change the value of innodb_concurrency_tickets to invalid value #
###########################################################################
SET @@global.innodb_concurrency_tickets = -1;
SELECT @@global.innodb_concurrency_tickets;
SET @@global.innodb_concurrency_tickets = -1024;
SELECT @@global.innodb_concurrency_tickets;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.innodb_concurrency_tickets = "T";
SELECT @@global.innodb_concurrency_tickets;
@ -96,22 +117,35 @@ SELECT @@global.innodb_concurrency_tickets;
SET @@global.innodb_concurrency_tickets = "Y";
SELECT @@global.innodb_concurrency_tickets;
SET @@global.innodb_concurrency_tickets = 1001;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.innodb_concurrency_tickets = 1.1;
SELECT @@global.innodb_concurrency_tickets;
--echo '#----------------------FN_DYNVARS_046_05------------------------#'
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.innodb_concurrency_tickets = " ";
SELECT @@global.innodb_concurrency_tickets;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.innodb_concurrency_tickets = ' ';
SELECT @@global.innodb_concurrency_tickets;
--echo '#----------------------FN_DYNVARS_046_06------------------------#'
#########################################################################
# Check if the value in GLOBAL Table matches value in variable #
#########################################################################
--disable_warnings
SELECT @@global.innodb_concurrency_tickets =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_concurrency_tickets';
--enable_warnings
SELECT @@global.innodb_concurrency_tickets;
--disable_warnings
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_concurrency_tickets';
--enable_warnings
--echo '#---------------------FN_DYNVARS_046_06-------------------------#'
--echo '#---------------------FN_DYNVARS_046_07-------------------------#'
###################################################################
# Check if ON and OFF values can be used on variable #
###################################################################
@ -124,7 +158,7 @@ SELECT @@global.innodb_concurrency_tickets;
SET @@global.innodb_concurrency_tickets = ON;
SELECT @@global.innodb_concurrency_tickets;
--echo '#---------------------FN_DYNVARS_046_07----------------------#'
--echo '#---------------------FN_DYNVARS_046_08----------------------#'
###################################################################
# Check if TRUE and FALSE values can be used on variable #
###################################################################