1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tokudb tests that fail in --ps-protocol

Browse Source 
https://github.com/Tokutek/ft-engine/issues/153
This commit is contained in:
Sergei Golubchik 2013-12-12 14:58:44 +01:00
parent 976e242c78
commit 5313e00199
6 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
View File

@ -1,20 +1,17 @@
SET DEFAULT_STORAGE_ENGINE = 'tokudb'; SET DEFAULT_STORAGE_ENGINE = 'tokudb';
set global tokudb_checkpoint_on_flush_logs=ON; set global tokudb_checkpoint_on_flush_logs=ON;
# Establish connection conn1 (user = root) # Establish connection conn1 (user = root)
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
flush logs;; flush logs;;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Query executing select DB, command, state, info from information_schema.processlist
test Query NULL flush logs test Query NULL flush logs
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
set global tokudb_checkpoint_on_flush_logs=OFF; set global tokudb_checkpoint_on_flush_logs=OFF;

18
storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result
View File

@ -2,45 +2,39 @@ SET DEFAULT_STORAGE_ENGINE = 'tokudb';
set GLOBAL tokudb_checkpoint_on_flush_logs=ON; set GLOBAL tokudb_checkpoint_on_flush_logs=ON;
# Establish connection conn1 (user = root) # Establish connection conn1 (user = root)
# should see nothing # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
flush logs; flush logs;
# should see nothing # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
set session tokudb_checkpoint_lock=1; set session tokudb_checkpoint_lock=1;
flush logs;; flush logs;;
# should see a flush logs # should see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Query executing select DB, command, state, info from information_schema.processlist
test Sleep NULL test Sleep NULL
test Query NULL flush logs test Query NULL flush logs
set session tokudb_checkpoint_lock=1; set session tokudb_checkpoint_lock=1;
# should still see a flush logs # should still see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Query executing select DB, command, state, info from information_schema.processlist
test Sleep NULL test Sleep NULL
test Query NULL flush logs test Query NULL flush logs
set session tokudb_checkpoint_lock=0; set session tokudb_checkpoint_lock=0;
# should still see a flush logs # should still see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
test Query NULL flush logs test Query NULL flush logs
set session tokudb_checkpoint_lock=0; set session tokudb_checkpoint_lock=0;
# should see nothing # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Query executing select DB, command, state, info from information_schema.processlist
test Sleep NULL test Sleep NULL
test Sleep NULL test Sleep NULL
set GLOBAL tokudb_checkpoint_on_flush_logs=OFF; set GLOBAL tokudb_checkpoint_on_flush_logs=OFF;

9
storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result
View File

@ -1,18 +1,15 @@
SET DEFAULT_STORAGE_ENGINE = 'tokudb'; SET DEFAULT_STORAGE_ENGINE = 'tokudb';
# Establish connection conn1 (user = root) # Establish connection conn1 (user = root)
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Sleep NULL test Sleep NULL
test Query executing select DB, command, state, info from information_schema.processlist
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
flush logs;; flush logs;;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
DB command state info DB command state info
test Query executing select DB, command, state, info from information_schema.processlist
test Sleep NULL test Sleep NULL
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;

6
storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test
View File

@ -8,9 +8,9 @@ connect (conn1,localhost,root,,);
connection default; connection default;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection conn1; connection conn1;
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
@ -20,7 +20,7 @@ connection default;
connection conn1; connection conn1;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
connection default; connection default;

12
storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test
View File

@ -13,11 +13,11 @@ connect (conn2,localhost,root,,);
connection default; connection default;
--sleep 2 --sleep 2
--echo # should see nothing --echo # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
flush logs; flush logs;
--echo # should see nothing --echo # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection conn1; connection conn1;
@ -29,25 +29,25 @@ connection default;
connection conn2; connection conn2;
--sleep 2 --sleep 2
--echo # should see a flush logs --echo # should see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
set session tokudb_checkpoint_lock=1; set session tokudb_checkpoint_lock=1;
--echo # should still see a flush logs --echo # should still see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection conn1; connection conn1;
--sleep 2 --sleep 2
set session tokudb_checkpoint_lock=0; set session tokudb_checkpoint_lock=0;
--echo # should still see a flush logs --echo # should still see a flush logs
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection conn2; connection conn2;
set session tokudb_checkpoint_lock=0; set session tokudb_checkpoint_lock=0;
--sleep 2 --sleep 2
--echo # should see nothing --echo # should see nothing
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection default; connection default;

6
storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test
View File

@ -7,9 +7,9 @@ connect (conn1,localhost,root,,);
connection default; connection default;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
flush logs; flush logs;
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
connection conn1; connection conn1;
set tokudb_checkpoint_lock=1; set tokudb_checkpoint_lock=1;
@ -19,7 +19,7 @@ connection default;
connection conn1; connection conn1;
--sleep 2 --sleep 2
select DB, command, state, info from information_schema.processlist; select DB, command, state, info from information_schema.processlist where id!= connection_id();
set tokudb_checkpoint_lock=0; set tokudb_checkpoint_lock=0;
connection default; connection default;