List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:September 22 2010 11:36am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3771)
View as plain text  
#At file:///home/msvensson/mysql/7.0-seagull-move-execute_count_inc/ based on revid:jonas@stripped-gfb6k9g89c2bmr7o

 3771 Magnus Blåudd	2010-09-22
      ndb tests for mtr
       - move include files used only in suite/ndb from include/ to suite/ndb/include

    renamed:
      mysql-test/include/ndb_execute_count.inc => mysql-test/suite/ndb/include/ndb_execute_count.inc
      mysql-test/include/ndb_init_execute_count.inc => mysql-test/suite/ndb/include/ndb_init_execute_count.inc
    modified:
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/ndb/t/ndb_sql_allow_batching.test
      mysql-test/suite/ndb/t/ndb_update_no_read.test
=== renamed file 'mysql-test/include/ndb_execute_count.inc' => 'mysql-test/suite/ndb/include/ndb_execute_count.inc'
=== renamed file 'mysql-test/include/ndb_init_execute_count.inc' => 'mysql-test/suite/ndb/include/ndb_init_execute_count.inc'
=== modified file 'mysql-test/suite/ndb/t/ndb_bulk_delete.test'
--- a/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2008-09-24 14:44:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2010-09-22 11:36:01 +0000
@@ -29,9 +29,9 @@ insert into t1 select a+128 from t1;
 --echo # 0 - delete the rows (without bulk update this is 5 + 1 for execute no commit)
 --echo # 1 - delete the row + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where a in (1,7, 90, 100, 130);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 # Test delete with non existant pk
 # Bug 37153
@@ -42,9 +42,9 @@ delete from t1 where a in (1,7, 90, 100,
 --echo # 1 - commit
 --echo # affected = 0
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where a=1000;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 --echo # expected result 1 roundtrips
 --echo # 0 - info call
@@ -53,9 +53,9 @@ delete from t1 where a=1000;
 --echo # 1 - commit
 --echo # affected = 0
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where a in (1000, 1001, 1002, 1003, 1004);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # cleanup

=== modified file 'mysql-test/suite/ndb/t/ndb_read_multi_range.test'
--- a/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2009-02-03 13:35:56 +0000
+++ b/mysql-test/suite/ndb/t/ndb_read_multi_range.test	2010-09-22 11:36:01 +0000
@@ -14,98 +14,98 @@ create table t1 (
   c int not null,
   index(b), unique index using hash(c)
 ) engine = ndb;
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 insert into t1 values
   (1,2,1),(2,3,2),(3,4,3),(4,5,4),
   (5,2,12),(6,3,11),(7,4,10),(8,5,9),
   (9,2,8),(10,3,7),(11,4,6),(12,5,5);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 # batch on primary key
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where a in (2,8,12);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
 # batch on ordered index
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where b in (1,2,5);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
 # batch on unique hash index
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where c in (2,8,12);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
 # batch mixed
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where a in (2,8) or (a > 11) or (a <= 1);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
 # batch on primary key, missing values
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where a in (33,8,12);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where a in (2,33,8,12,34);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
 # batch on ordered index, missing values
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where b in (1,33,5);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where b in (1,33,5) order by a;
---source include/ndb_execute_count.inc
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where b in (45,1,33,5,44);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where b in (45,22) order by a;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 # batch on unique hash index, missing values
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where c in (2,8,33);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1 where c in (13,2,8,33,12);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a;
 drop table r1;
 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where a in (33,8,12) order by a;
---source include/ndb_execute_count.inc
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where a in (33,34,35) order by a;
---source include/ndb_execute_count.inc
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where a in (2,8) or (a > 11) or (a <= 1) order by a;
---source include/ndb_execute_count.inc
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where b in (6,7) or (b <= 5) or (b >= 10) order by b,a;
---source include/ndb_execute_count.inc
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 select * from t1 where c in (13,2,8,33,12) order by c,a;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 drop table t1;
 
 #
@@ -121,7 +121,7 @@ create table t1 (
   primary key (a,b,c,d), index (d)
 ) engine = ndb;
 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 insert into t1 values
   (1,2,1,1,1),(2,3,2,3,1),(3,4,3,1,1),(4,5,4,7,1),
   (5,2,12,12,1),(6,3,11,1,1),(7,4,10,3,1),(8,5,9,5,1),
@@ -130,13 +130,13 @@ insert into t1 values
   (1,2,1,3,1),
   (1,2,1,4,1),
   (1,2,1,5,1);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 # batch on primary key
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 create table r1 as select * from t1
   where a=1 and b=2 and c=1 and d in (1,4,3,2);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from r1 order by a,b,c,d;
 drop table r1;
 

=== modified file 'mysql-test/suite/ndb/t/ndb_sql_allow_batching.test'
--- a/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test	2008-05-08 08:39:40 +0000
+++ b/mysql-test/suite/ndb/t/ndb_sql_allow_batching.test	2010-09-22 11:36:01 +0000
@@ -13,36 +13,36 @@ create table t2 (a int key, b int) engin
 insert into t1 values (0,0),(1,1),(2,2);
 insert into t2 select * from t1;
 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 set transaction_allow_batching=1;
 update t1 set b=0 where a=2;
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from t1 order by a;
 
 --echo
 --echo With batching only 1 roundtrip
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 set transaction_allow_batching=1;
 insert into t1 values (10,10);
 insert into t2 values (10,10);
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from t1 order by a;
 
 --echo
 --echo Without batching only 3 roundtrips
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 set transaction_allow_batching=0;
 insert into t1 values (11,11);
 insert into t2 values (11,11);
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 select * from t1 order by a;
 
 # cleanup

=== modified file 'mysql-test/suite/ndb/t/ndb_update_no_read.test'
--- a/mysql-test/suite/ndb/t/ndb_update_no_read.test	2008-12-05 09:46:39 +0000
+++ b/mysql-test/suite/ndb/t/ndb_update_no_read.test	2010-09-22 11:36:01 +0000
@@ -34,9 +34,9 @@ insert into t1 values (1,10,1),(2,9,1),(
 --echo # 0 - update the row (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 111, b = 20 where a = 1;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where a = 1 order by a;
 
@@ -47,9 +47,9 @@ select * from t1 where a = 1 order by a;
 --echo # 0 - delete the row (deferred to commit)
 --echo # 1 - delete + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where a = 1;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where a = 1 order by a;
 
@@ -60,9 +60,9 @@ select * from t1 where a = 1 order by a;
 --echo # 0 - update the row (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 1111 where b = 2;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 2 order by a;
 
@@ -73,9 +73,9 @@ select * from t1 where b = 2 order by a;
 --echo # 0 - update the row (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 12, b = 19 where b = 2;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 2 order by a;
 
@@ -86,9 +86,9 @@ select * from t1 where b = 2 order by a;
 --echo # 0 - delete the row (deferred to commit)
 --echo # 1 - delete and commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where b = 19;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 19 order by a;
 
@@ -99,9 +99,9 @@ select * from t1 where b = 19 order by a
 --echo # 0 - update the rows (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 22 where a = 10 or a >= 10;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 order by a;
 
@@ -112,9 +112,9 @@ select * from t1 order by a;
 --echo # 0 - update the rows (2 if no bulk update + 1 deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 23 where a in (8,10);
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 order by a;
 
@@ -125,9 +125,9 @@ select * from t1 order by a;
 --echo # 0 - update the rows (executed during read)
 --echo # 1 - commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 23 where a in (7,8) or a >= 10;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 order by a;
 
@@ -141,11 +141,11 @@ select * from t1 order by a;
 --echo # 0 - update the rows (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 11 where a = 3 or b = 7;
 ### Disable this test, as it's unpredictable...
 ### cause scan can get one or two batches...
-#--source include/ndb_execute_count.inc
+#--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where a = 3 or b = 7 order by a;
 
@@ -158,9 +158,9 @@ select * from t1 where a = 3 or b = 7 or
 --echo # 1 - insert the row (pk update)
 --echo # 1 - commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set a = 13, b = 20 where a = 3;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where a = 13 order by a;
 
@@ -173,9 +173,9 @@ select * from t1 where a = 13 order by a
 --echo # 1 - insert the row (pk update)
 --echo # 1 - commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set a = 12, b = 19 where b = 7;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 19 order by a;
 
@@ -188,9 +188,9 @@ select * from t1 where b = 7 order by a;
 --echo # 0 - update the rows (deferred to commit)
 --echo # 1 - update + commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set c = 12, b = 29 where a = 5 and b = 6;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 19 order by a;
 
@@ -201,9 +201,9 @@ select * from t1 where b = 19 order by a
 --echo # 0 - delete the rows (no row found)
 --echo # 1 - commit the transaction
 --echo
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 delete from t1 where b = 6 and c = 12;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 select * from t1 where b = 6 order by a;
 
@@ -227,9 +227,9 @@ insert into t1 values (1, '1'), (2, '2')
 --echo # 1 - update+commit the row
 --echo # Rows matched=changed=affected=1
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set b='two' where a=2;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # Autocommit, unsuccessful update
@@ -241,9 +241,9 @@ update t1 set b='two' where a=2;
 --echo # 1 - update+commit the row
 --echo # Rows matched=changed=affected=0
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set b='lots' where a=2000;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 # Autocommit, successful update + warning
 --echo
@@ -255,9 +255,9 @@ update t1 set b='lots' where a=2000;
 --echo # Rows matched=changed=affected=1
 --echo # 1 warning
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set b='one plus one' where a=2;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # Autocommit, unsuccessful update + warning
@@ -271,10 +271,10 @@ update t1 set b='one plus one' where a=2
 --echo # 1 warning
 --echo 
 --disable_warnings # Workaround to bug#39663
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 update t1 set b='two thousand' where a=2000;
 show warnings; # Workaround to bug#39663
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 --enable_warnings # Workaround to bug#39663
 
 
@@ -287,11 +287,11 @@ show warnings; # Workaround to bug#39663
 --echo # 1 - commit
 --echo # Rows matched=changed=affected=1
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 update t1 set b='two' where a=2;
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # No autocommit, unsuccessful update
@@ -303,11 +303,11 @@ commit;
 --echo # 1 - commit
 --echo # Rows matched=changed=affected=0
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 update t1 set b='lots' where a=2000;
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # No autocommit, successful update + warning
@@ -320,11 +320,11 @@ commit;
 --echo # Rows matched=changed=affected=1
 --echo 1 warning
 --echo 
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 update t1 set b='one plus one' where a=2;
 commit;
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 
 
 # No autocommit, unsuccessful update + warning
@@ -338,12 +338,12 @@ commit;
 --echo # 1 warning
 --echo 
 --disable_warnings # Workaround to bug#39663
---source include/ndb_init_execute_count.inc
+--source suite/ndb/include/ndb_init_execute_count.inc
 begin;
 update t1 set b='two thousand' where a=2000;
 commit;
 show warnings; # Workaround to bug#39663
---source include/ndb_execute_count.inc
+--source suite/ndb/include/ndb_execute_count.inc
 --enable_warnings # Workaround to bug#39663
 
 drop table t1;

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20100922113601-jduivvgbrr1d8ayp.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3771) Magnus Blåudd22 Sep