diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-20 17:53:55 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-03-20 17:53:55 +0400 |
| commit | 089fca6bb6d6ccdf68bacfa9d022e1a072db9ada (patch) | |
| tree | 32ab39c7e6d17c6d75951c2a80b6f0dccb0c94a0 /mysql-test/t | |
| parent | adf4f63513cc2e5fa9eea271bf3991cac509a4e9 (diff) | |
| download | mariadb-git-089fca6bb6d6ccdf68bacfa9d022e1a072db9ada.tar.gz | |
tests fixed to work in embedded server
mysql-test/r/delayed.result:
result fixed
mysql-test/r/merge.result:
result fixed
mysql-test/t/delayed.test:
moved here from merge.test
mysql-test/t/init_connect.test:
test fixed as it created users, then stopped without deletion, what caused
problems in consequent tests
mysql-test/t/merge.test:
moved to delayed.test
mysql-test/t/mysqlbinlog-cp932.test:
disabled in embedded server
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/delayed.test | 10 | ||||
| -rw-r--r-- | mysql-test/t/init_connect.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog-cp932.test | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index 773927f6015..13615c8c269 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -242,3 +242,13 @@ INSERT DELAYED INTO t1 VALUES(1); FLUSH TABLE t1; SELECT HEX(a) FROM t1; DROP TABLE t1; + +# +# Bug#26464 - insert delayed + update + merge = corruption +# +CREATE TABLE t1(c1 INT) ENGINE=MyISAM; +CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1); +--error 1031 +INSERT DELAYED INTO t2 VALUES(1); +DROP TABLE t1, t2; + diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test index c9a18a4003d..0a08559279c 100644 --- a/mysql-test/t/init_connect.test +++ b/mysql-test/t/init_connect.test @@ -2,10 +2,11 @@ # Test of init_connect variable # +# should work with embedded server after mysqltest is fixed +--source include/not_embedded.inc + --source include/add_anonymous_users.inc -# should work with embedded server after mysqltest is fixed --- source include/not_embedded.inc connect (con0,localhost,root,,); connection con0; select hex(@a); diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 07923fa020c..490010c0a42 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -430,16 +430,7 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1); SELECT * FROM tm1; DROP TABLE t1, tm1; -# -# Bug#26464 - insert delayed + update + merge = corruption -# -CREATE TABLE t1(c1 INT) ENGINE=MyISAM; -CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1); ---error 1031 -INSERT DELAYED INTO t2 VALUES(1); -DROP TABLE t1, t2; -# # BUG#26881 - Large MERGE tables report incorrect specification when no # differences in tables # diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/t/mysqlbinlog-cp932.test index 0e0a4e2bfae..1487606a6c2 100644 --- a/mysql-test/t/mysqlbinlog-cp932.test +++ b/mysql-test/t/mysqlbinlog-cp932.test @@ -1,3 +1,5 @@ +# disabled in embedded until tools running is fixed with embedded +--source include/not_embedded.inc -- source include/have_cp932.inc # Bug#16217 (mysql client did not know how not switch its internal charset) |