#3911 merge the checkpoint lock tests from 5.0.5 to main refs[t:3911]

git-svn-id: file:///svn/mysql/tests/mysql-test@34244 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.bugs/r/checkpoint_lock.result

 SET STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
-select DB, command, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Sleep	0		NULL
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
+select DB, command, state, info from information_schema.processlist;
+DB	command	state	info
+test	Sleep		NULL
+test	Query	executing	select DB, command, state, info from information_schema.processlist
 flush logs;
-select DB, command, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Sleep	0		NULL
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
-test	Query	2	NULL	flush logs
+select DB, command, state, info from information_schema.processlist;
+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;

mysql-test/suite/tokudb.bugs/r/checkpoint_lock_2.result

 SET STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 # should see nothing
-select DB, command, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Sleep	0		NULL
-test	Sleep	0		NULL
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Sleep	0		NULL
-test	Sleep	0		NULL
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
-test	Sleep	2		NULL
-test	Query	2	NULL	flush logs
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
-test	Sleep	2		NULL
-test	Query	2	NULL	flush logs
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Sleep	2		NULL
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
-test	Query	4	NULL	flush logs
+select DB, command, state, info from information_schema.processlist;
+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, time, state, info from information_schema.processlist;
-DB	command	time	state	info
-test	Query	0	executing	select DB, command, time, state, info from information_schema.processlist
-test	Sleep	2		NULL
-test	Sleep	6		NULL
+select DB, command, state, info from information_schema.processlist;
+DB	command	state	info
+test	Query	executing	select DB, command, state, info from information_schema.processlist
+test	Sleep		NULL
+test	Sleep		NULL

mysql-test/suite/tokudb.bugs/t/checkpoint_lock.test

@@ -7,9 +7,10 @@ SET STORAGE_ENGINE = 'tokudb';
 connect (conn1,localhost,root,,);
 
 connection default;
-select DB, command, time, state, info from information_schema.processlist;
+--sleep 2
+select DB, command, state, info from information_schema.processlist;
 flush logs;
-select DB, command, time, state, info from information_schema.processlist;
+select DB, command, state, info from information_schema.processlist;
 
 connection conn1;
 set tokudb_checkpoint_lock=1;
@@ -19,7 +20,7 @@ connection default;
 
 connection conn1;
 --sleep 2
-select DB, command, time, state, info from information_schema.processlist;
+select DB, command, state, info from information_schema.processlist;
 set tokudb_checkpoint_lock=0;
 
 connection default;

mysql-test/suite/tokudb.bugs/t/checkpoint_lock_2.test

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