summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/backup.test8
-rw-r--r--mysql-test/t/bdb.test10
-rw-r--r--mysql-test/t/status.test3
3 files changed, 17 insertions, 4 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test
index 1bd57d68b49..22ec4b6f2f1 100644
--- a/mysql-test/t/backup.test
+++ b/mysql-test/t/backup.test
@@ -4,7 +4,7 @@ connection con1;
set SQL_LOG_BIN=0;
drop table if exists t1;
create table t1(n int);
---replace "errno = 2" "errno = X" "errno = 22" "errno = X"
+--replace_result "errno = 2" "errno = X" "errno = 22" "errno = X"
backup table t1 to '../bogus';
backup table t1 to '../tmp';
drop table t1;
@@ -29,9 +29,11 @@ select k from t3;
drop table t1,t2,t3;
restore table t1 from '../tmp';
connection con2;
-send lock tables t1 write;
+--send
+lock tables t1 write;
connection con1;
-send backup table t1 to '../tmp';
+--send
+backup table t1 to '../tmp';
connection con2;
reap;
unlock tables;
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index 5f8ef3ff18e..f4b4d17e180 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -419,3 +419,13 @@ select * from t1 order by b desc;
optimize table t1;
show keys from t1;
drop table t1;
+
+#
+# Test of bug in create index with NULL columns
+#
+create table t1 (i int, j int )TYPE=BDB;
+insert into t1 values (1,2);
+select * from t1 where i=1 and j=2;
+create index ax1 on t1 (i,j);
+select * from t1 where i=1 and j=2;
+drop table t1;
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test
index 7c825469f09..8b5ab3565ad 100644
--- a/mysql-test/t/status.test
+++ b/mysql-test/t/status.test
@@ -13,7 +13,8 @@ lock tables t1 read;
unlock tables;
lock tables t1 read;
connection con1;
-send update t1 set n = 3;
+--send
+update t1 set n = 3;
connection con2;
sleep 0.5;
unlock tables;