diff options
| author | unknown <ramil@mysql.com> | 2006-06-15 17:37:47 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-06-15 17:37:47 +0500 |
| commit | 4a9985762e6e84889be669e071b0d3ac68a205fa (patch) | |
| tree | a1942fc7093cb1e338561642dea2dccc9a9f8893 /mysql-test/r/archive.result | |
| parent | 689205ae947176220ef7ba7332ffa2b765c4796a (diff) | |
| parent | ef02d496a07f76a830ca7e21907df65a58ddb4d7 (diff) | |
| download | mariadb-git-4a9985762e6e84889be669e071b0d3ac68a205fa.tar.gz | |
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
ul
sql/ha_archive.cc:
ul
sql/item_func.cc:
ul
Diffstat (limited to 'mysql-test/r/archive.result')
| -rw-r--r-- | mysql-test/r/archive.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 88bb3126fb6..3be1cdcf15a 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -6254,6 +6254,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 3 011402 37 Romans scholastics jarring 4 011403 37 intercepted audiology tinily DELETE FROM t2; +ERROR HY000: Table storage engine for 't2' doesn't have this option SELECT * FROM t2; auto fld1 companynr fld3 fld4 fld5 fld6 1 000001 00 Omaha teethe neat @@ -8685,6 +8686,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 3 011402 37 Romans scholastics jarring 4 011403 37 intercepted audiology tinily TRUNCATE TABLE t2; +ERROR HY000: Table storage engine for 't2' doesn't have this option SELECT * FROM t2; auto fld1 companynr fld3 fld4 fld5 fld6 1 000001 00 Omaha teethe neat |