summaryrefslogtreecommitdiff
path: root/mysql-test/suite/archive
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2017-11-25 18:04:14 +0300
committerAleksey Midenkov <midenok@gmail.com>2017-11-27 15:07:34 +0300
commit01a8bad897abcc1445d98886bfdfff7a2b2d1530 (patch)
treee0c340c8f6e9c57c6a47f57004de1b799158f2b4 /mysql-test/suite/archive
parent62470fc7874515e2bc8bc00cb38844f19c465d7e (diff)
downloadmariadb-git-01a8bad897abcc1445d98886bfdfff7a2b2d1530.tar.gz
SQL: allow PERIOD as identifier [fixes #331]
Diffstat (limited to 'mysql-test/suite/archive')
-rw-r--r--mysql-test/suite/archive/archive.result10
-rw-r--r--mysql-test/suite/archive/archive.test4
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result
index f0ef14495fa..d294d3dfe58 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 19b46195682..30f2766507e 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;