diff options
| author | Elena Stepanova <elenst@ubuntu11.home> | 2013-01-13 17:01:34 +0400 |
|---|---|---|
| committer | Elena Stepanova <elenst@ubuntu11.home> | 2013-01-13 17:01:34 +0400 |
| commit | 72695309385d19e783f1c4e25fba4f6388bbea30 (patch) | |
| tree | a6a700d7b73ea73c509664ca17851e70bb4f1a6a /storage | |
| parent | bc75820fb7fa4c945c164dea9eac8e19058d7605 (diff) | |
| download | mariadb-git-72695309385d19e783f1c4e25fba4f6388bbea30.tar.gz | |
MDEV-3990: engine tests went out of sync with current MariaDB code
Reasons:
alter_tablespace.rdiff:
tc_rename_error.result:
from monty@askmonty.org-20120529213755-876ptdhhaj0t7l8r
(Added text for errno in error messages)
insert_time.result:
from sergii@pisem.net-20120908101555-37w00eyfrd9noc06
(MDEV-457 - Inconsistent data truncation)
misc.result:
from igor@askmonty.org-20130109033433-5awdv0w6vbpigltw
(MDEV-3806/mwl248 - Engine independent statistics)
tbl_opt_row_format.rdiff:
from monty@askmonty.org-20120706161018-y5teinbuqpchle2m
(Fixed wrong error codes)
vcol.rdiff:
sergii@pisem.net-20121217100039-ikj1820nrku7p6d5
(simplify the handler api)
Diffstat (limited to 'storage')
3 files changed, 13 insertions, 2 deletions
diff --git a/storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff b/storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff new file mode 100644 index 00000000000..0cbe1fa48ae --- /dev/null +++ b/storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff @@ -0,0 +1,11 @@ +--- suite/storage_engine/alter_tablespace.result 2013-01-13 01:03:49.133994000 +0400 ++++ suite/storage_engine/alter_tablespace.reject 2013-01-13 01:04:04.398937286 +0400 +@@ -10,7 +10,7 @@ + 2 + ALTER TABLE t1 DISCARD TABLESPACE; + SELECT * FROM t1; +-ERROR HY000: Got error -1 from storage engine ++ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine + ALTER TABLE t1 IMPORT TABLESPACE; + SELECT * FROM t1; + a diff --git a/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff b/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff index 4c0e0c375f5..8bf84115a52 100644 --- a/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff +++ b/storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff @@ -4,7 +4,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED; +Warnings: -+Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT. ++Warning 140 InnoDB: assuming ROW_FORMAT=COMPACT. SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff index 20431a9c713..094b26668c1 100644 --- a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff @@ -67,7 +67,7 @@ < 4 5 < DROP TABLE t1; --- -> ERROR HY000: MRG_MYISAM storage engine does not support computed columns +> ERROR HY000: MRG_MyISAM storage engine does not support computed columns > # ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed) > # ------------ UNEXPECTED RESULT ------------ > # [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ] |