#230 disable the tokudb bulk loader in the tokudb locks schema tests

8 files changed, 10 insertions, 6 deletions

diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result b/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result
index f84be01163f..db63d23e382 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result
+++ b/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_released.result
@@ -9,6 +9,7 @@ locks_trx_id	locks_mysql_thread_id	locks_dname	locks_key_left	locks_key_right
 select * from information_schema.tokudb_lock_waits;
 requesting_trx_id	blocking_trx_id	lock_waits_dname	lock_waits_key_left	lock_waits_key_right	lock_waits_start_time
 set autocommit=0;
+set tokudb_prelock_empty=OFF;
 insert into t values (1);
 set autocommit=0;
 insert into t values (1);
@@ -38,6 +39,7 @@ locks_trx_id	locks_mysql_thread_id	locks_dname	locks_key_left	locks_key_right
 select * from information_schema.tokudb_lock_waits;
 requesting_trx_id	blocking_trx_id	lock_waits_dname	lock_waits_key_left	lock_waits_key_right	lock_waits_start_time
 set autocommit=0;
+set tokudb_prelock_empty=OFF;
 replace into t values (1);
 set autocommit=0;
 replace into t values (1);
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result b/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result
index 1e0668164ff..10e3830506d 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result
+++ b/mysql-test/suite/tokudb/r/i_s_tokudb_lock_waits_timeout.result
@@ -9,6 +9,7 @@ locks_trx_id	locks_mysql_thread_id	locks_dname	locks_key_left	locks_key_right
 select * from information_schema.tokudb_lock_waits;
 requesting_trx_id	blocking_trx_id	lock_waits_dname	lock_waits_key_left	lock_waits_key_right	lock_waits_start_time
 set autocommit=0;
+set tokudb_prelock_empty=OFF;
 insert into t values (1);
 set autocommit=0;
 insert into t values (1);
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result b/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result
index ad252da448f..9fce0695983 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result
+++ b/mysql-test/suite/tokudb/r/i_s_tokudb_locks.result
@@ -12,7 +12,7 @@ set autocommit=0;
 insert into t values (2);
 insert into t values (4);
 insert into t values (6);
-select * from information_schema.tokudb_locks order by locks_trx_id;
+select * from information_schema.tokudb_locks order by locks_trx_id,locks_key_left;
 locks_trx_id	locks_mysql_thread_id	locks_dname	locks_key_left	locks_key_right
 TRX_ID	MYSQL_ID	./test/t-main	0001000000	0001000000
 TRX_ID	MYSQL_ID	./test/t-main	0003000000	0003000000
diff --git a/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result b/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result
index 21a6b5d308c..628ff46ffc4 100644
--- a/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result
+++ b/mysql-test/suite/tokudb/r/i_s_tokudb_locks_released.result
@@ -6,6 +6,7 @@ set autocommit=0;
 select * from information_schema.tokudb_locks;
 locks_trx_id	locks_mysql_thread_id	locks_dname	locks_key_left	locks_key_right
 set autocommit=0;
+set tokudb_prelock_empty=OFF;
 insert into t values (1);
 set autocommit=0;
 insert into t values (1);
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test
index 25a62c08a14..f259c5fe6bc 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test
+++ b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test
@@ -19,6 +19,7 @@ select * from information_schema.tokudb_lock_waits;
 
 connect (conn_a,localhost,root,,);
 set autocommit=0;
+set tokudb_prelock_empty=OFF; # disable the bulk loader
 insert into t values (1);
 
 connect (conn_b,localhost,root,,);
@@ -68,6 +69,7 @@ select * from information_schema.tokudb_lock_waits;
 
 connect (conn_a,localhost,root,,);
 set autocommit=0;
+set tokudb_prelock_empty=OFF; # disable the bulk loader
 replace into t values (1);
 
 connect (conn_b,localhost,root,,);
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test
index ea7eb9a2c89..d7925733a0f 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test
+++ b/mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test
@@ -16,6 +16,7 @@ select * from information_schema.tokudb_lock_waits;
 
 connect (conn_a,localhost,root,,);
 set autocommit=0;
+set tokudb_prelock_empty=OFF;
 insert into t values (1);
 
 connect (conn_b,localhost,root,,);
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test b/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test
index a3745b5471b..e5a67559b1a 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test
+++ b/mysql-test/suite/tokudb/t/i_s_tokudb_locks.test
@@ -29,7 +29,7 @@ insert into t values (6);
 # should find 3 locks for 2 transactions
 connection default;
 replace_column 1 TRX_ID 2 MYSQL_ID;
-eval select * from information_schema.tokudb_locks order by locks_trx_id;
+eval select * from information_schema.tokudb_locks order by locks_trx_id,locks_key_left;
 
 connection conn_a;
 commit;
diff --git a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test b/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test
index be475d93c2c..4d654244682 100644
--- a/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test
+++ b/mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test
@@ -14,20 +14,17 @@ let $default_id=`select connection_id()`;
 # should be empty
 select * from information_schema.tokudb_locks;
 
-
 connect (conn_a,localhost,root,,);
 set autocommit=0;
-let $a_id=`select connection_id()`;
+set tokudb_prelock_empty=OFF; # disable bulk loader
 
 insert into t values (1);
 
 connect (conn_b,localhost,root,,);
 set autocommit=0;
-let $b_id=`select connection_id()`;
 
 send insert into t values (1);
 
-
 # should find the presence of a lock on 2nd transaction
 connection default;
 let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';