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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-01-20 08:41:52 +02:00
parent 9be5c19c34 ceffabc421
commit bc43bf3e43
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/innodb/r/innodb_wl6326.result
View File

@ -1,4 +1,3 @@
DROP TABLE IF EXISTS t1;
SET GLOBAL innodb_adaptive_hash_index = false; SET GLOBAL innodb_adaptive_hash_index = false;
SET GLOBAL innodb_stats_persistent = false; SET GLOBAL innodb_stats_persistent = false;
connect con1,localhost,root,,; connect con1,localhost,root,,;
@ -281,8 +280,8 @@ connection con3;
SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'cn'; SELECT a00,a01 FROM t1 WHERE a00 = 'cn';
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
connection con1; connection con1;
connection con2; connection con2;
@ -311,8 +310,8 @@ connection con3;
SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'el'; SELECT a00,a01 FROM t1 WHERE a00 = 'el';
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
connection con1; connection con1;
connection con2; connection con2;
@ -347,8 +346,8 @@ connection con3;
SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2'; SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'gb'; SELECT a00,a01 FROM t1 WHERE a00 = 'gb';
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
connection con1; connection con1;
connection con2; connection con2;

24
mysql-test/suite/innodb/t/innodb_wl6326.test
View File

@ -12,9 +12,6 @@ SET @old_innodb_limit_optimistic_insert_debug = @@innodb_limit_optimistic_insert
SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index; SET @old_innodb_adaptive_hash_index = @@innodb_adaptive_hash_index;
SET @old_innodb_stats_persistent = @@innodb_stats_persistent; SET @old_innodb_stats_persistent = @@innodb_stats_persistent;
--enable_query_log --enable_query_log
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
# Save the initial number of concurrent sessions # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc
@ -353,8 +350,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'cn'; SELECT a00,a01 FROM t1 WHERE a00 = 'cn';
--connection default --connection default
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; # FIXME: These occasionally time out!
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; --disable_warnings
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
--enable_warnings
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
--connection con1 --connection con1
@ -407,8 +407,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'el'; SELECT a00,a01 FROM t1 WHERE a00 = 'el';
--connection default --connection default
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; # FIXME: These occasionally time out!
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; --disable_warnings
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
--enable_warnings
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
--connection con1 --connection con1
@ -461,8 +464,11 @@ SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait2';
SELECT a00,a01 FROM t1 WHERE a00 = 'gb'; SELECT a00,a01 FROM t1 WHERE a00 = 'gb';
--connection default --connection default
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1'; # FIXME: These occasionally time out!
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2'; --disable_warnings
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1 TIMEOUT 1';
SET DEBUG_SYNC = 'now WAIT_FOR lockwait2 TIMEOUT 1';
--enable_warnings
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
--connection con1 --connection con1

3
mysql-test/suite/innodb_gis/t/rtree_rollback1.test
View File

@ -1,9 +1,6 @@
# WL#6745 InnoDB R-tree support # WL#6745 InnoDB R-tree support
# This test case will test R-tree split. # This test case will test R-tree split.
# Not supported in embedded
--source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/big_test.inc --source include/big_test.inc
--source include/not_valgrind.inc --source include/not_valgrind.inc

3
mysql-test/suite/innodb_gis/t/rtree_rollback2.test
View File

@ -1,9 +1,6 @@
# WL#6745 InnoDB R-tree support # WL#6745 InnoDB R-tree support
# This test case will test R-tree split. # This test case will test R-tree split.
# Not supported in embedded
--source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/big_test.inc --source include/big_test.inc
--source include/not_valgrind.inc --source include/not_valgrind.inc