diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-07 00:37:49 +0300 |
| commit | d8d725101992d50b00edf149e7ccd7f720b850dc (patch) | |
| tree | 5797a3c9af2d2db487ec77093608f89b7dabe62f /mysql-test/suite/archive | |
| parent | 835cbbcc7b797188a89671019f2b2844e1a14e0c (diff) | |
| parent | ce66d5b2a53d76d286e8443807c4ebd7743cc354 (diff) | |
| download | mariadb-git-d8d725101992d50b00edf149e7ccd7f720b850dc.tar.gz | |
System Versioning pre0.12
Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3
Diffstat (limited to 'mysql-test/suite/archive')
| -rw-r--r-- | mysql-test/suite/archive/archive.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/archive/archive.test | 4 | ||||
| -rw-r--r-- | mysql-test/suite/archive/disabled.def | 12 |
3 files changed, 19 insertions, 7 deletions
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result index d294d3dfe58..f0ef14495fa 100644 --- a/mysql-test/suite/archive/archive.result +++ b/mysql-test/suite/archive/archive.result @@ -3,18 +3,18 @@ call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired DROP TABLE if exists t1,t2,t3,t4,t5,t6; SET storage_engine=ARCHIVE; CREATE TABLE t1 ( -Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, +Period_ smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL ) ENGINE=archive; INSERT INTO t1 VALUES (9410,9412); -select period FROM t1; -period +select period_ FROM t1; +period_ 9410 select * FROM t1; -Period Varor_period +Period_ Varor_period 9410 9412 select t1.* FROM t1; -Period Varor_period +Period_ Varor_period 9410 9412 CREATE TABLE t2 ( auto int, diff --git a/mysql-test/suite/archive/archive.test b/mysql-test/suite/archive/archive.test index 30f2766507e..19b46195682 100644 --- a/mysql-test/suite/archive/archive.test +++ b/mysql-test/suite/archive/archive.test @@ -15,13 +15,13 @@ SET storage_engine=ARCHIVE; let $MYSQLD_DATADIR= `SELECT @@datadir`; CREATE TABLE t1 ( - Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, + Period_ smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL ) ENGINE=archive; INSERT INTO t1 VALUES (9410,9412); -select period FROM t1; +select period_ FROM t1; select * FROM t1; select t1.* FROM t1; diff --git a/mysql-test/suite/archive/disabled.def b/mysql-test/suite/archive/disabled.def new file mode 100644 index 00000000000..1aeb519e763 --- /dev/null +++ b/mysql-test/suite/archive/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +archive-big: versioning branch
\ No newline at end of file |