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

Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik
2017-03-30 12:48:42 +02:00
1708 changed files with 29631 additions and 15718 deletions

View File

@ -41,11 +41,9 @@ a
1
2
3
SET DEBUG='+d,crash_commit_before';
Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
BEGIN;
INSERT INTO t2 VALUES (42);
ERROR HY000: Lost connection to MySQL server during query
# Kill and restart
disconnect con1;
disconnect con2;
connection default;
@ -100,11 +98,7 @@ SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: before_row_upd_extern';
info
UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2
SET DEBUG='+d,crash_commit_before';
Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
COMMIT;
ERROR HY000: Lost connection to MySQL server during query
# Kill and restart
disconnect con2;
connection default;
ERROR HY000: Lost connection to MySQL server during query
@ -136,11 +130,7 @@ SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: after_row_upd_extern';
info
UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2
SET DEBUG='+d,crash_commit_before';
Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
COMMIT;
ERROR HY000: Lost connection to MySQL server during query
# Kill and restart
disconnect con2;
connection default;
ERROR HY000: Lost connection to MySQL server during query