mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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)
This commit is contained in:
@ -15,7 +15,7 @@ ERROR 42S01: Table 't1' already exists
|
|||||||
RENAME TABLE t3 TO t1;
|
RENAME TABLE t3 TO t1;
|
||||||
ERROR 42S01: Table 't1' already exists
|
ERROR 42S01: Table 't1' already exists
|
||||||
RENAME TABLE t3 TO doesnotexist.t1;
|
RENAME TABLE t3 TO doesnotexist.t1;
|
||||||
ERROR HY000: Can't find file: './test/t3.frm' (errno: 2)
|
ERROR HY000: Can't find file: './test/t3.frm' (errno: 2 "No such file or directory")
|
||||||
SHOW TABLES;
|
SHOW TABLES;
|
||||||
Tables_in_test
|
Tables_in_test
|
||||||
t1
|
t1
|
||||||
|
@ -5167,7 +5167,6 @@ c1 c2 c3
|
|||||||
825:23:00 825:23:00 2009-01-05
|
825:23:00 825:23:00 2009-01-05
|
||||||
10:00:00 10:00:00 2009-01-06
|
10:00:00 10:00:00 2009-01-06
|
||||||
00:00:45 00:00:45 2009-01-07
|
00:00:45 00:00:45 2009-01-07
|
||||||
00:00:00 00:00:00 2009-01-09
|
|
||||||
838:59:59 838:59:59 2009-01-10
|
838:59:59 838:59:59 2009-01-10
|
||||||
10:11:12 10:11:12 2009-01-11
|
10:11:12 10:11:12 2009-01-11
|
||||||
11:11:12 11:11:12 2009-01-12
|
11:11:12 11:11:12 2009-01-12
|
||||||
@ -5178,18 +5177,12 @@ c1 c2 c3
|
|||||||
11:11:27 11:11:27 2009-01-17
|
11:11:27 11:11:27 2009-01-17
|
||||||
08:03:02 08:03:02 2009-01-18
|
08:03:02 08:03:02 2009-01-18
|
||||||
00:11:12 00:11:12 2009-01-19
|
00:11:12 00:11:12 2009-01-19
|
||||||
00:00:11 00:00:11 2009-01-20
|
|
||||||
00:12:30 00:12:30 2009-01-23
|
00:12:30 00:12:30 2009-01-23
|
||||||
09:00:45 09:00:45 2009-01-24
|
09:00:45 09:00:45 2009-01-24
|
||||||
09:36:00 09:36:00 2009-01-25
|
09:36:00 09:36:00 2009-01-25
|
||||||
00:00:10 00:00:10 2009-01-26
|
|
||||||
00:00:00 00:00:00 2009-01-27
|
|
||||||
00:00:00 00:00:00 2009-01-28
|
|
||||||
00:00:00 00:00:00 2009-01-29
|
|
||||||
262:22:00 262:22:00 2009-01-30
|
262:22:00 262:22:00 2009-01-30
|
||||||
00:00:12 00:00:12 2009-01-31
|
00:00:12 00:00:12 2009-01-31
|
||||||
08:29:45 NULL 2009-02-01
|
08:29:45 NULL 2009-02-01
|
||||||
00:00:00 07:23:55 NULL
|
|
||||||
TRUNCATE TABLE t5;
|
TRUNCATE TABLE t5;
|
||||||
DROP TABLE t5;
|
DROP TABLE t5;
|
||||||
DROP TABLE t1,t2,t3,t4;
|
DROP TABLE t1,t2,t3,t4;
|
||||||
|
@ -28,6 +28,9 @@ DROP EVENT ev1;
|
|||||||
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
|
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
|
||||||
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
|
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
|
||||||
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
|
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
|
||||||
|
column_stats column_name NULL NULL
|
||||||
|
column_stats db_name NULL NULL
|
||||||
|
column_stats table_name NULL NULL
|
||||||
columns_priv Column_name NULL NULL
|
columns_priv Column_name NULL NULL
|
||||||
columns_priv Db NULL NULL
|
columns_priv Db NULL NULL
|
||||||
columns_priv Host NULL NULL
|
columns_priv Host NULL NULL
|
||||||
@ -49,6 +52,10 @@ help_topic help_topic_id NULL NULL
|
|||||||
help_topic name NULL NULL
|
help_topic name NULL NULL
|
||||||
host Db NULL NULL
|
host Db NULL NULL
|
||||||
host Host NULL NULL
|
host Host NULL NULL
|
||||||
|
index_stats db_name NULL NULL
|
||||||
|
index_stats index_name NULL NULL
|
||||||
|
index_stats prefix_arity NULL NULL
|
||||||
|
index_stats table_name NULL NULL
|
||||||
ndb_binlog_index epoch NULL NULL
|
ndb_binlog_index epoch NULL NULL
|
||||||
plugin name NULL NULL
|
plugin name NULL NULL
|
||||||
proc db NULL NULL
|
proc db NULL NULL
|
||||||
@ -64,6 +71,8 @@ proxies_priv Proxied_host NULL NULL
|
|||||||
proxies_priv Proxied_user NULL NULL
|
proxies_priv Proxied_user NULL NULL
|
||||||
proxies_priv User NULL NULL
|
proxies_priv User NULL NULL
|
||||||
servers Server_name NULL NULL
|
servers Server_name NULL NULL
|
||||||
|
table_stats db_name NULL NULL
|
||||||
|
table_stats table_name NULL NULL
|
||||||
tables_priv Db NULL NULL
|
tables_priv Db NULL NULL
|
||||||
tables_priv Host NULL NULL
|
tables_priv Host NULL NULL
|
||||||
tables_priv Table_name NULL NULL
|
tables_priv Table_name NULL NULL
|
||||||
|
@ -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
|
@ -4,7 +4,7 @@
|
|||||||
DROP TABLE IF EXISTS t1;
|
DROP TABLE IF EXISTS t1;
|
||||||
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
|
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
|
||||||
+Warnings:
|
+Warnings:
|
||||||
+Warning 1478 InnoDB: assuming ROW_FORMAT=COMPACT.
|
+Warning 140 InnoDB: assuming ROW_FORMAT=COMPACT.
|
||||||
SHOW CREATE TABLE t1;
|
SHOW CREATE TABLE t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
< 4 5
|
< 4 5
|
||||||
< DROP TABLE t1;
|
< 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)
|
> # ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed)
|
||||||
> # ------------ UNEXPECTED RESULT ------------
|
> # ------------ 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 ]
|
> # [ 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 ]
|
||||||
|
Reference in New Issue
Block a user