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/r/delayed.result | |
| 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/r/delayed.result')
| -rw-r--r-- | mysql-test/r/delayed.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 82a308c63e7..b37679847be 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -250,3 +250,8 @@ SELECT HEX(a) FROM t1; HEX(a) 1 DROP TABLE t1; +CREATE TABLE t1(c1 INT) ENGINE=MyISAM; +CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1); +INSERT DELAYED INTO t2 VALUES(1); +ERROR HY000: Table storage engine for 't2' doesn't have this option +DROP TABLE t1, t2; |