bzr commit into mysql-5.1 branch (tomas.ulin:3077)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.4/

 3077 Tomas Ulin	2008-11-13
      test cases
added:
  mysql-test/suite/ndb/r/ndb_dbug_tc_select.result
  mysql-test/suite/ndb/t/ndb_dbug_tc_select.test
  mysql-test/suite/ndb/t/ndb_dbug_tc_select_1.inc
  mysql-test/suite/ndb/t/ndb_dbug_tc_select_2.inc
  mysql-test/suite/ndb/t/ndb_dbug_tc_select_3.inc

=== added file 'mysql-test/suite/ndb/r/ndb_dbug_tc_select.result'
--- a/mysql-test/suite/ndb/r/ndb_dbug_tc_select.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dbug_tc_select.result	2008-11-13 19:34:09 +0000
@@ -0,0 +1,96 @@
+drop table if exists t1,t2;
+create table t1 (a int key, b int) engine ndb;
+create table t2 (a int, b int, c int, d int, primary key(a,b), unique(d)) engine ndb
partition by key(a);
+# 2-way join tc selection in pk
+# 2-way join tc selection in unique key
+drop table t1,t2;
+create table t1 (a int , b varchar(22), c int, primary key(a), unique(b)) engine ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a varchar(1024), b int , c int, primary key(a), unique(b)) engine ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a varchar(32), b varchar(257), c int, primary key(a), unique(b)) engine
ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a int , b int, c int, d int, primary key(a,c), unique(c,b)) engine ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a int, b char(22) , c char(12), d int, primary key(a,c), unique(c,b))
engine ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a varchar(32), b int, c varchar(257), d int, primary key(a,c),
unique(c,b)) engine ndb;
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a int , b int, c int, d int, e int, primary key(a,c,e), unique(c,b,d))
engine ndb partition by key(c,e);
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a int, b varchar(22) , c char(12), d int, e varchar(257), primary
key(a,c,e), unique(c,b,d)) engine ndb partition by key(c,e);
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;
+create table t1 (a varchar(1024), b char(22), c varchar(257), d int, e char(12), primary
key(a,c,e), unique(c,b,d)) engine ndb partition by key(c,e);
+# verify tc select on insert using simple int key
+# verify tc select on select using simple pk int key
+# verify tc select on select using simple unique int key
+# verify tc select on update using simple pk int key
+# verify tc select on update using simple unique int key
+# verify tc select on delete using simple pk int key
+# verify tc select on delete using simple unique int key
+# Cleanup
+drop table t1;

=== added file 'mysql-test/suite/ndb/t/ndb_dbug_tc_select.test'
--- a/mysql-test/suite/ndb/t/ndb_dbug_tc_select.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dbug_tc_select.test	2008-11-13 19:34:09 +0000
@@ -0,0 +1,101 @@
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 0" >> $NDB_TOOLS_OUTPUT
+-- source include/have_ndb.inc
+# We are using some debug-only features in this test
+--source include/have_debug.inc
+
+--disable_warnings
+drop table if exists t1,t2;
+--enable_warnings
+
+# make ndb nodes die if correct tc is not selected
+
+create table t1 (a int key, b int) engine ndb;
+create table t2 (a int, b int, c int, d int, primary key(a,b), unique(d)) engine ndb
partition by key(a);
+--disable_query_log
+--disable_result_log
+let $i= 100;
+let $j= 1;
+while ($i)
+{
+--eval insert into t1 values ("$i","$j")
+--eval insert into t2 values ("$i","$j",9999,"$j")
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # 2-way join tc selection in pk
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 8072" >> $NDB_TOOLS_OUTPUT
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select t2.c from t1,t2 where t1.a="$i" and t2.a=t2.a and t2.b=t1.b
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # 2-way join tc selection in unique key
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 8071" >> $NDB_TOOLS_OUTPUT
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select t1.b from t1,t2 where t2.d="$i" and t1.a=t2.a
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+# cleanup
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 0" >> $NDB_TOOLS_OUTPUT
+drop table t1,t2;
+
+--let $type1= int 
+--let $type2= varchar(22)
+--source suite/ndb/t/ndb_dbug_tc_select_1.inc
+
+--let $type1= varchar(1024)
+--let $type2= int 
+--source suite/ndb/t/ndb_dbug_tc_select_1.inc
+
+--let $type1= varchar(32)
+--let $type2= varchar(257)
+--source suite/ndb/t/ndb_dbug_tc_select_1.inc
+
+--let $type1= int 
+--let $type2= int
+--let $type3= int
+--source suite/ndb/t/ndb_dbug_tc_select_2.inc
+
+--let $type1= int
+--let $type2= char(22) 
+--let $type3= char(12)
+--source suite/ndb/t/ndb_dbug_tc_select_2.inc
+
+--let $type1= varchar(32)
+--let $type2= int
+--let $type3= varchar(257)
+--source suite/ndb/t/ndb_dbug_tc_select_2.inc
+
+--let $type1= int 
+--let $type2= int
+--let $type3= int
+--let $type4= int
+--source suite/ndb/t/ndb_dbug_tc_select_3.inc
+
+--let $type1= int
+--let $type2= varchar(22) 
+--let $type3= char(12)
+--let $type4= varchar(257)
+--source suite/ndb/t/ndb_dbug_tc_select_3.inc
+
+--let $type1= varchar(1024)
+--let $type2= char(22)
+--let $type3= varchar(257)
+--let $type4= char(12)
+--source suite/ndb/t/ndb_dbug_tc_select_3.inc

=== added file 'mysql-test/suite/ndb/t/ndb_dbug_tc_select_1.inc'
--- a/mysql-test/suite/ndb/t/ndb_dbug_tc_select_1.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dbug_tc_select_1.inc	2008-11-13 19:34:09 +0000
@@ -0,0 +1,94 @@
+
+--eval create table t1 (a $type1, b $type2, c int, primary key(a), unique(b)) engine ndb
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 8072" >> $NDB_TOOLS_OUTPUT
+
+--echo # verify tc select on insert using simple int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+let $j= 1;
+while ($i)
+{
+--eval insert into t1 values ("$i","$j",0)
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select * from t1 where a="$i"
+dec $i;
+}
+
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select * from t1 where b="$i"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval update t1 set c="10" where a="$i"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval update t1 set c="11" where b="$i"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+while ($i)
+{
+--eval delete from t1 where a="$i"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+while ($i)
+{
+--eval delete from t1 where b="$i"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # Cleanup
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 0" >> $NDB_TOOLS_OUTPUT
+drop table t1;

=== added file 'mysql-test/suite/ndb/t/ndb_dbug_tc_select_2.inc'
--- a/mysql-test/suite/ndb/t/ndb_dbug_tc_select_2.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dbug_tc_select_2.inc	2008-11-13 19:34:09 +0000
@@ -0,0 +1,94 @@
+
+--eval create table t1 (a $type1, b $type2, c $type3, d int, primary key(a,c),
unique(c,b)) engine ndb
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 8072" >> $NDB_TOOLS_OUTPUT
+
+--echo # verify tc select on insert using simple int key
+--disable_query_log
+--disable_result_log
+let $i= 1000;
+let $j= 1;
+while ($i)
+{
+--eval insert into t1 values ("$i","$j",0,0)
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select * from t1 where a="$i" and c="0"
+dec $i;
+}
+
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select * from t1 where b="$i" and c="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval update t1 set d="10" where a="$i" and c="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval update t1 set d=11 where b="$i" and c="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+while ($i)
+{
+--eval delete from t1 where a="$i" and c="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+while ($i)
+{
+--eval delete from t1 where b="$i" and c="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # Cleanup
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 0" >> $NDB_TOOLS_OUTPUT
+drop table t1;

=== added file 'mysql-test/suite/ndb/t/ndb_dbug_tc_select_3.inc'
--- a/mysql-test/suite/ndb/t/ndb_dbug_tc_select_3.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dbug_tc_select_3.inc	2008-11-13 19:34:09 +0000
@@ -0,0 +1,100 @@
+
+--eval create table t1 (a $type1, b $type2, c $type3, d int, e $type4, primary
key(a,c,e), unique(c,b,d)) engine ndb partition by key(c,e)
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 8072" >> $NDB_TOOLS_OUTPUT
+
+--echo # verify tc select on insert using simple int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+let $j= 1;
+while ($i)
+{
+--eval insert into t1 values ("$i","$j",0,0,"$j")
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+let $j= 1;
+while ($i)
+{
+--eval select * from t1 where a="$i" and c="0" and e="$j"
+dec $i;
+inc $j;
+}
+
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on select using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval select * from t1 where b="$i" and c="0" and d="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+let $j= 1;
+while ($i)
+{
+--eval update t1 set d="10" where a="$i" and c="0" and e="$j"
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on update using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 100;
+while ($i)
+{
+--eval update t1 set d=11 where b="$i" and c="0" and d="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple pk int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+let $j= 1;
+while ($i)
+{
+--eval delete from t1 where a="$i" and c="0" and e="$j"
+dec $i;
+inc $j;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # verify tc select on delete using simple unique int key
+--disable_query_log
+--disable_result_log
+let $i= 40;
+while ($i)
+{
+--eval delete from t1 where b="$i" and c="0" and d="0"
+dec $i;
+}
+--enable_query_log
+--enable_result_log
+
+--echo # Cleanup
+--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "all
error 0" >> $NDB_TOOLS_OUTPUT
+drop table t1;