From 5313e001998a13e02d1ca84a4d6674160b1c58bb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 12 Dec 2013 14:58:44 +0100 Subject: [PATCH] fix tokudb tests that fail in --ps-protocol https://github.com/Tokutek/ft-engine/issues/153 --- .../tokudb_bugs/r/checkpoint_lock.result | 9 +++------ .../tokudb_bugs/r/checkpoint_lock_2.result | 18 ++++++------------ .../tokudb_bugs/r/checkpoint_lock_3.result | 9 +++------ .../tokudb_bugs/t/checkpoint_lock.test | 6 +++--- .../tokudb_bugs/t/checkpoint_lock_2.test | 12 ++++++------ .../tokudb_bugs/t/checkpoint_lock_3.test | 6 +++--- 6 files changed, 24 insertions(+), 36 deletions(-) diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result index 7532cddd97f..b572ac3b6e1 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result @@ -1,20 +1,17 @@ SET DEFAULT_STORAGE_ENGINE = 'tokudb'; set global tokudb_checkpoint_on_flush_logs=ON; # 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 test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist 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 test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist set tokudb_checkpoint_lock=1; 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 -test Query executing select DB, command, state, info from information_schema.processlist test Query NULL flush logs set tokudb_checkpoint_lock=0; set global tokudb_checkpoint_on_flush_logs=OFF; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result index 63a688ef11b..5ef3c001935 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_2.result @@ -2,45 +2,39 @@ SET DEFAULT_STORAGE_ENGINE = 'tokudb'; set GLOBAL tokudb_checkpoint_on_flush_logs=ON; # Establish connection conn1 (user = root) # 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 test Sleep NULL test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist flush logs; # 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 test Sleep NULL test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist set session tokudb_checkpoint_lock=1; 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 -test Query executing select DB, command, state, info from information_schema.processlist test Sleep NULL test Query NULL flush logs set session tokudb_checkpoint_lock=1; # 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 -test Query executing select DB, command, state, info from information_schema.processlist test Sleep NULL test Query NULL flush logs set session tokudb_checkpoint_lock=0; # 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 test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist test Query NULL flush logs set session tokudb_checkpoint_lock=0; # 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 -test Query executing select DB, command, state, info from information_schema.processlist test Sleep NULL test Sleep NULL set GLOBAL tokudb_checkpoint_on_flush_logs=OFF; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result index a6c41e08570..968d86e5659 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock_3.result @@ -1,18 +1,15 @@ SET DEFAULT_STORAGE_ENGINE = 'tokudb'; # 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 test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist 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 test Sleep NULL -test Query executing select DB, command, state, info from information_schema.processlist set tokudb_checkpoint_lock=1; 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 -test Query executing select DB, command, state, info from information_schema.processlist test Sleep NULL set tokudb_checkpoint_lock=0; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test index be72c26b841..ac39ac569fd 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock.test @@ -8,9 +8,9 @@ connect (conn1,localhost,root,,); connection default; --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; -select DB, command, state, info from information_schema.processlist; +select DB, command, state, info from information_schema.processlist where id!= connection_id(); connection conn1; set tokudb_checkpoint_lock=1; @@ -20,7 +20,7 @@ connection default; connection conn1; --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; connection default; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test index 44db2ca2f7c..c399dc24649 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_2.test @@ -13,11 +13,11 @@ connect (conn2,localhost,root,,); connection default; --sleep 2 --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; --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; @@ -29,25 +29,25 @@ connection default; connection conn2; --sleep 2 --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; --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; --sleep 2 set session tokudb_checkpoint_lock=0; --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; set session tokudb_checkpoint_lock=0; --sleep 2 --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; diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test index 1bb70eab163..b21aef1f6bc 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/checkpoint_lock_3.test @@ -7,9 +7,9 @@ connect (conn1,localhost,root,,); connection default; --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; -select DB, command, state, info from information_schema.processlist; +select DB, command, state, info from information_schema.processlist where id!= connection_id(); connection conn1; set tokudb_checkpoint_lock=1; @@ -19,7 +19,7 @@ connection default; connection conn1; --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; connection default;