#3453 merge mysql-test.3453 to mysql-test refs[t:3453]

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

mysql-test/suite/tokudb.hotindex/r/hotindex-del-0.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 delete from s where a=10000;
 delete from s where a=9999;
 delete from s where a=9998;

mysql-test/suite/tokudb.hotindex/r/hotindex-del-1.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create clustering index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 delete from s where a=10000;
 delete from s where a=9999;
 delete from s where a=9998;

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-0.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 insert into s values (1000000000,10000);
 insert into s values (1000000000,9999);
 insert into s values (1000000000,9998);

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-1.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create clustering index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 insert into s values (1000000000,10000);
 insert into s values (1000000000,9999);
 insert into s values (1000000000,9998);

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-2.result

@@ -6,8 +6,6 @@ create table s (a int auto_increment, b int, c int, primary key (a));
 # done inserting elements
 set tokudb_create_index_online=1;
 create index i_a on s(c);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 # starting insert while create index is happening
 # done with insert
 select count(*) from s use index(primary);

mysql-test/suite/tokudb.hotindex/r/hotindex-insert-bigchar.result

@@ -4,8 +4,6 @@ drop table if exists s;
 create table s (a int, b varchar(2000));
 set tokudb_create_index_online=1;
 create clustering index i_a on s(b);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 insert into s values (1000000000,repeat('a', 2000));
 insert into s values (1000000000,repeat('a', 2000));
 insert into s values (1000000000,repeat('a', 2000));

mysql-test/suite/tokudb.hotindex/r/hotindex-update-0.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 update s set a=20000+10000 where a=10000;
 update s set a=20000+9999 where a=9999;
 update s set a=20000+9998 where a=9998;

mysql-test/suite/tokudb.hotindex/r/hotindex-update-1.result

@@ -10004,8 +10004,6 @@ insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9)
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
 set tokudb_create_index_online=1;
 create clustering index i_a on s(a);
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 update s set a=20000+10000 where a=10000;
 update s set a=20000+9999 where a=9999;
 update s set a=20000+9998 where a=9998;

mysql-test/suite/tokudb.hotindex/t/hotindex-del-0.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $a = 10000;
 while ($a) {
     eval delete from s where a=$a;

mysql-test/suite/tokudb.hotindex/t/hotindex-del-1.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create clustering index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $a = 10000;
 while ($a) {
     eval delete from s where a=$a;

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-0.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $b=10000;
 while ($b) {
     eval insert into s values (1000000000,$b);

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-1.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create clustering index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $b=10000;
 while ($b) {
     eval insert into s values (1000000000,$b);

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-2.test

@@ -28,8 +28,6 @@ set tokudb_create_index_online=1;
 send create index i_a on s(c);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 
 --echo # starting insert while create index is happening
 --disable_query_log

mysql-test/suite/tokudb.hotindex/t/hotindex-insert-bigchar.test

@@ -27,8 +27,6 @@ set tokudb_create_index_online=1;
 send create clustering index i_a on s(b);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $b=10000;
 while ($b) {
     eval insert into s values (1000000000,repeat('a', 2000));

mysql-test/suite/tokudb.hotindex/t/hotindex-update-0.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $a = 10000;
 while ($a) {
     eval update s set a=20000+$a where a=$a;

mysql-test/suite/tokudb.hotindex/t/hotindex-update-1.test

@@ -24,8 +24,6 @@ set tokudb_create_index_online=1;
 send create clustering index i_a on s(a);
 
 connection conn1;
-set tokudb_write_lock_wait=1;
-set tokudb_read_lock_wait=1;
 let $a = 10000;
 while ($a) {
     eval update s set a=20000+$a where a=$a;

mysql-test/suite/tokudb.locks/r/blocking-row-locks-getset.result

 select @@tokudb_lock_timeout;
 @@tokudb_lock_timeout
-30000000
+4000000
 set global tokudb_lock_timeout=1234567;
 select @@tokudb_lock_timeout;
 @@tokudb_lock_timeout
@@ -13,7 +13,7 @@ set global tokudb_lock_timeout=1000000;
 select @@tokudb_lock_timeout;
 @@tokudb_lock_timeout
 1000000
-set global tokudb_lock_timeout=30000000;
+set global tokudb_lock_timeout=4000000;
 select @@tokudb_lock_timeout;
 @@tokudb_lock_timeout
-30000000
+4000000

mysql-test/suite/tokudb.locks/t/blocking-row-locks-getset.test

@@ -11,5 +11,5 @@ select @@tokudb_lock_timeout;
 # settle on a 2 second timeout going forward
 set global tokudb_lock_timeout=1000000;
 select @@tokudb_lock_timeout;
-set global tokudb_lock_timeout=30000000;
+set global tokudb_lock_timeout=4000000;
 select @@tokudb_lock_timeout;