database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4028 - Converted rdiff files to uniform

Browse Source 
MDEV-11 - Modifed tests and result files to use explicit column lists
          in INSERT and SELECT statements
This commit is contained in:
Elena Stepanova
2013-02-03 02:53:57 +04:00
parent 1701ee3357
commit 7f444caa0a
213 changed files with 7031 additions and 5955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
storage/myisammrg/mysql-test/storage_engine/create_table.rdiff
View File

@@ -1,37 +1,57 @@
7c7
< ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
---
> ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
16c16
< ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
---
> ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
22c22
< ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
---
> ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
27,36c27,35
< SHOW CREATE TABLE t1;
< Table Create Table
< t1 CREATE TABLE `t1` (
< `1` bigint(20) NOT NULL DEFAULT '0'
< ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
< SELECT * FROM t1;
< 1
< 1
< 2
< DROP TABLE t1;
---
> ERROR HY000: 'test.t1' is not BASE TABLE
> # ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed)
> # ------------ UNEXPECTED RESULT ------------
> # The statement|command finished with ER_WRONG_OBJECT.
> # CREATE TABLE .. AS SELECT or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
> # You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
> # Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
> # Also, this problem may cause a chain effect (more errors of different kinds in the test).
> # -------------------------------------------
43c42
< ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
---
> ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
--- create_table.result 2013-01-22 22:05:05.246633000 +0400
+++ create_table.reject 2013-01-23 02:50:19.544006752 +0400
@@ -4,7 +4,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
CREATE TABLE IF NOT EXISTS t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
Warnings:
Note 1050 Table 't1' already exists
@@ -13,33 +13,32 @@
Table Create Table
t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
CREATE TEMPORARY TABLE t2 LIKE t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TEMPORARY TABLE `t2` (
`a` int(11) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
DROP TEMPORARY TABLE t2;
DROP TABLE t2;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> AS SELECT 1 UNION SELECT 2;
-SHOW CREATE TABLE t1;
-Table Create Table
-t1 CREATE TABLE `t1` (
- `1` bigint(20) NOT NULL DEFAULT '0'
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-SELECT * FROM t1;
-1
-1
-2
-DROP TABLE t1;
+ERROR HY000: 'test.t1' is not BASE TABLE
+# ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_WRONG_OBJECT.
+# CREATE TABLE .. AS SELECT or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
SET storage_engine = <STORAGE_ENGINE>;
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
FLUSH LOGS;
DROP TABLE IF EXISTS t1;