mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge mysql-5.1->mysql-5.1-security
This commit is contained in:
Georgi Kodinov
119
mysql-test/suite/innodb_plugin/r/innodb-blob.result
Normal file
119
mysql-test/suite/innodb_plugin/r/innodb-blob.result
Normal file
@ -0,0 +1,119 @@
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
|
||||
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
|
||||
CREATE TABLE t3 (a INT PRIMARY KEY, b TEXT, c TEXT) ENGINE=InnoDB;
|
||||
INSERT INTO t1 VALUES (1,REPEAT('a',30000)),(2,REPEAT('b',40000));
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR go1';
|
||||
BEGIN;
|
||||
UPDATE t1 SET a=a+2;
|
||||
ROLLBACK;
|
||||
BEGIN;
|
||||
UPDATE t1 SET b=CONCAT(b,'foo');
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
SELECT a, RIGHT(b,20) FROM t1;
|
||||
SET DEBUG_SYNC='now SIGNAL go1';
|
||||
a RIGHT(b,20)
|
||||
1 aaaaaaaaaaaaaaaaaaaa
|
||||
2 bbbbbbbbbbbbbbbbbbbb
|
||||
SET DEBUG='+d,row_ins_extern_checkpoint';
|
||||
SET DEBUG_SYNC='before_row_ins_extern_latch SIGNAL rec_not_blob WAIT_FOR crash';
|
||||
ROLLBACK;
|
||||
BEGIN;
|
||||
INSERT INTO t1 VALUES (3,REPEAT('c',50000));
|
||||
SET DEBUG_SYNC='now WAIT_FOR rec_not_blob';
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
SELECT @@tx_isolation;
|
||||
@@tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
SELECT a, RIGHT(b,20) FROM t1;
|
||||
a RIGHT(b,20)
|
||||
1 aaaaaaaaaaaaaaaaaaaa
|
||||
2 bbbbbbbbbbbbbbbbbbbb
|
||||
SELECT a FROM t1;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
SET DEBUG='+d,crash_commit_before';
|
||||
INSERT INTO t2 VALUES (42);
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
CHECK TABLE t1;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check status OK
|
||||
INSERT INTO t3 VALUES
|
||||
(1,REPEAT('d',7000),REPEAT('e',100)),
|
||||
(2,REPEAT('g',7000),REPEAT('h',100));
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR go';
|
||||
UPDATE t3 SET c=REPEAT('f',3000) WHERE a=1;
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
SELECT @@tx_isolation;
|
||||
@@tx_isolation
|
||||
READ-UNCOMMITTED
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
SET DEBUG_SYNC='now SIGNAL go';
|
||||
a RIGHT(b,20) RIGHT(c,20)
|
||||
1 dddddddddddddddddddd ffffffffffffffffffff
|
||||
2 gggggggggggggggggggg hhhhhhhhhhhhhhhhhhhh
|
||||
CHECK TABLE t1,t2,t3;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check status OK
|
||||
test.t2 check status OK
|
||||
test.t3 check status OK
|
||||
BEGIN;
|
||||
INSERT INTO t2 VALUES (347);
|
||||
SET DEBUG='+d,row_upd_extern_checkpoint';
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
|
||||
UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2;
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
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';
|
||||
COMMIT;
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
CHECK TABLE t1,t2,t3;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check status OK
|
||||
test.t2 check status OK
|
||||
test.t3 check status OK
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
a RIGHT(b,20) RIGHT(c,20)
|
||||
1 dddddddddddddddddddd ffffffffffffffffffff
|
||||
2 gggggggggggggggggggg hhhhhhhhhhhhhhhhhhhh
|
||||
SELECT a FROM t3;
|
||||
a
|
||||
1
|
||||
2
|
||||
BEGIN;
|
||||
INSERT INTO t2 VALUES (33101);
|
||||
SET DEBUG='+d,row_upd_extern_checkpoint';
|
||||
SET DEBUG_SYNC='after_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
|
||||
UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2;
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
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';
|
||||
COMMIT;
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
ERROR HY000: Lost connection to MySQL server during query
|
||||
CHECK TABLE t1,t2,t3;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check status OK
|
||||
test.t2 check status OK
|
||||
test.t3 check status OK
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
a RIGHT(b,20) RIGHT(c,20)
|
||||
1 dddddddddddddddddddd ffffffffffffffffffff
|
||||
2 gggggggggggggggggggg hhhhhhhhhhhhhhhhhhhh
|
||||
SELECT a FROM t3;
|
||||
a
|
||||
1
|
||||
2
|
||||
SELECT * FROM t2;
|
||||
a
|
||||
DROP TABLE t1,t2,t3;
|
||||
218
mysql-test/suite/innodb_plugin/t/innodb-blob.test
Normal file
218
mysql-test/suite/innodb_plugin/t/innodb-blob.test
Normal file
@ -0,0 +1,218 @@
|
||||
# Bug#13721257 RACE CONDITION IN UPDATES OR INSERTS OF WIDE RECORDS
|
||||
# Test what happens when a record is inserted or updated so that some
|
||||
# columns are stored off-page.
|
||||
|
||||
--source include/have_innodb_plugin.inc
|
||||
|
||||
# DEBUG_SYNC must be compiled in.
|
||||
--source include/have_debug_sync.inc
|
||||
|
||||
# Valgrind would complain about memory leaks when we crash on purpose.
|
||||
--source include/not_valgrind.inc
|
||||
# Embedded server does not support crashing
|
||||
--source include/not_embedded.inc
|
||||
# Avoid CrashReporter popup on Mac
|
||||
--source include/not_crashrep.inc
|
||||
# InnoDB Plugin cannot use DEBUG_SYNC on Windows
|
||||
--source include/not_windows.inc
|
||||
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
|
||||
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
|
||||
CREATE TABLE t3 (a INT PRIMARY KEY, b TEXT, c TEXT) ENGINE=InnoDB;
|
||||
|
||||
INSERT INTO t1 VALUES (1,REPEAT('a',30000)),(2,REPEAT('b',40000));
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR go1';
|
||||
BEGIN;
|
||||
# This will not block, because it will not store new BLOBs.
|
||||
UPDATE t1 SET a=a+2;
|
||||
ROLLBACK;
|
||||
BEGIN;
|
||||
--send
|
||||
UPDATE t1 SET b=CONCAT(b,'foo');
|
||||
|
||||
connect (con1,localhost,root,,);
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
|
||||
# this one should block due to the clustered index tree and leaf page latches
|
||||
--send
|
||||
SELECT a, RIGHT(b,20) FROM t1;
|
||||
|
||||
connect (con2,localhost,root,,);
|
||||
|
||||
# Check that the above SELECT is blocked
|
||||
let $wait_condition=
|
||||
select count(*) = 1 from information_schema.processlist
|
||||
where state = 'Sending data' and
|
||||
info = 'SELECT a, RIGHT(b,20) FROM t1';
|
||||
--source include/wait_condition.inc
|
||||
|
||||
SET DEBUG_SYNC='now SIGNAL go1';
|
||||
|
||||
connection con1;
|
||||
reap;
|
||||
connection default;
|
||||
reap;
|
||||
SET DEBUG='+d,row_ins_extern_checkpoint';
|
||||
SET DEBUG_SYNC='before_row_ins_extern_latch SIGNAL rec_not_blob WAIT_FOR crash';
|
||||
ROLLBACK;
|
||||
BEGIN;
|
||||
--send
|
||||
INSERT INTO t1 VALUES (3,REPEAT('c',50000));
|
||||
|
||||
connection con1;
|
||||
SET DEBUG_SYNC='now WAIT_FOR rec_not_blob';
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
SELECT @@tx_isolation;
|
||||
|
||||
# this one should see (3,NULL_BLOB)
|
||||
SELECT a, RIGHT(b,20) FROM t1;
|
||||
SELECT a FROM t1;
|
||||
|
||||
# Request a crash, and restart the server.
|
||||
SET DEBUG='+d,crash_commit_before';
|
||||
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
--error 2013
|
||||
INSERT INTO t2 VALUES (42);
|
||||
|
||||
disconnect con1;
|
||||
disconnect con2;
|
||||
connection default;
|
||||
# This connection should notice the crash as well.
|
||||
--error 2013
|
||||
reap;
|
||||
|
||||
# Write file to make mysql-test-run.pl restart the server
|
||||
--enable_reconnect
|
||||
--source include/wait_until_connected_again.inc
|
||||
--disable_reconnect
|
||||
|
||||
CHECK TABLE t1;
|
||||
|
||||
INSERT INTO t3 VALUES
|
||||
(1,REPEAT('d',7000),REPEAT('e',100)),
|
||||
(2,REPEAT('g',7000),REPEAT('h',100));
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR go';
|
||||
# This should move column b off-page.
|
||||
--send
|
||||
UPDATE t3 SET c=REPEAT('f',3000) WHERE a=1;
|
||||
|
||||
connect (con1,localhost,root,,);
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
|
||||
SELECT @@tx_isolation;
|
||||
|
||||
# this one should block
|
||||
-- send
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
|
||||
connect (con2,localhost,root,,);
|
||||
|
||||
# Check that the above SELECT is blocked
|
||||
let $wait_condition=
|
||||
select count(*) = 1 from information_schema.processlist
|
||||
where state = 'Sending data' and
|
||||
info = 'SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3';
|
||||
--source include/wait_condition.inc
|
||||
|
||||
SET DEBUG_SYNC='now SIGNAL go';
|
||||
|
||||
connection con1;
|
||||
reap;
|
||||
disconnect con1;
|
||||
|
||||
connection default;
|
||||
reap;
|
||||
|
||||
CHECK TABLE t1,t2,t3;
|
||||
|
||||
connection con2;
|
||||
BEGIN;
|
||||
INSERT INTO t2 VALUES (347);
|
||||
connection default;
|
||||
|
||||
# The row_upd_extern_checkpoint was removed in Bug#13721257,
|
||||
# because the mini-transaction of the B-tree modification would
|
||||
# remain open while we are writing the off-page columns and are
|
||||
# stuck in the DEBUG_SYNC. A checkpoint involves a flush, which
|
||||
# would wait for the buffer-fix to cease.
|
||||
SET DEBUG='+d,row_upd_extern_checkpoint';
|
||||
SET DEBUG_SYNC='before_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
|
||||
# This should move column b off-page.
|
||||
--send
|
||||
UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2;
|
||||
|
||||
connection con2;
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
|
||||
# Check that the above UPDATE is blocked
|
||||
SELECT info FROM information_schema.processlist
|
||||
WHERE state = 'debug sync point: before_row_upd_extern';
|
||||
|
||||
# Request a crash, and restart the server.
|
||||
SET DEBUG='+d,crash_commit_before';
|
||||
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
--error 2013
|
||||
COMMIT;
|
||||
|
||||
disconnect con2;
|
||||
connection default;
|
||||
# This connection should notice the crash as well.
|
||||
--error 2013
|
||||
reap;
|
||||
|
||||
# Write file to make mysql-test-run.pl restart the server
|
||||
--enable_reconnect
|
||||
--source include/wait_until_connected_again.inc
|
||||
--disable_reconnect
|
||||
|
||||
CHECK TABLE t1,t2,t3;
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
SELECT a FROM t3;
|
||||
|
||||
connect (con2,localhost,root,,);
|
||||
BEGIN;
|
||||
INSERT INTO t2 VALUES (33101);
|
||||
connection default;
|
||||
|
||||
# The row_upd_extern_checkpoint was removed in Bug#13721257,
|
||||
# because the mini-transaction of the B-tree modification would
|
||||
# remain open while we are writing the off-page columns and are
|
||||
# stuck in the DEBUG_SYNC. A checkpoint involves a flush, which
|
||||
# would wait for the buffer-fix to cease.
|
||||
SET DEBUG='+d,row_upd_extern_checkpoint';
|
||||
SET DEBUG_SYNC='after_row_upd_extern SIGNAL have_latch WAIT_FOR crash';
|
||||
# This should move column b off-page.
|
||||
--send
|
||||
UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2;
|
||||
|
||||
connection con2;
|
||||
SET DEBUG_SYNC='now WAIT_FOR have_latch';
|
||||
|
||||
# Check that the above UPDATE is blocked
|
||||
SELECT info FROM information_schema.processlist
|
||||
WHERE state = 'debug sync point: after_row_upd_extern';
|
||||
|
||||
# Request a crash, and restart the server.
|
||||
SET DEBUG='+d,crash_commit_before';
|
||||
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
--error 2013
|
||||
COMMIT;
|
||||
|
||||
disconnect con2;
|
||||
connection default;
|
||||
# This connection should notice the crash as well.
|
||||
--error 2013
|
||||
reap;
|
||||
|
||||
# Write file to make mysql-test-run.pl restart the server
|
||||
--enable_reconnect
|
||||
--source include/wait_until_connected_again.inc
|
||||
--disable_reconnect
|
||||
|
||||
CHECK TABLE t1,t2,t3;
|
||||
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
|
||||
SELECT a FROM t3;
|
||||
|
||||
SELECT * FROM t2;
|
||||
|
||||
DROP TABLE t1,t2,t3;
|
||||
Reference in New Issue
Block a user