SQL: allow PERIOD as identifier [fixes #331]

5 files changed, 24 insertions, 24 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;
 
diff --git a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
index ac2b2003f30..feed949a71a 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result
@@ -1,16 +1,16 @@
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 drop table if exists t1,t2;
 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=blackhole;
 INSERT INTO t1 VALUES (9410,9412);
-select period_ from t1;
-period_
+select period from t1;
+period
 select * from t1;
-Period_	Varor_period
+Period	Varor_period
 select t1.* from t1;
-Period_	Varor_period
+Period	Varor_period
 CREATE TABLE t2 (
 auto int NOT NULL auto_increment,
 fld1 int(6) unsigned zerofill DEFAULT '000000' NOT NULL,
diff --git a/mysql-test/suite/csv/csv.result b/mysql-test/suite/csv/csv.result
index c9f7c617b40..220b84b222e 100644
--- a/mysql-test/suite/csv/csv.result
+++ b/mysql-test/suite/csv/csv.result
@@ -3,18 +3,18 @@ call mtr.add_suppression("Table 'test_repair_table4' is marked as crashed and sh
 call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
 drop table if exists t1,t2,t3,t4;
 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 = CSV;
 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 not null,
@@ -4919,12 +4919,12 @@ DROP TABLE t1;
 ALTER TABLE t2 RENAME t1;
 DROP TABLE t1;
 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 = CSV;
 INSERT INTO t1 VALUES (9410,9412);
-select period_ from t1;
-period_
+select period from t1;
+period
 9410
 drop table if exists t1,t2,t3,t4;
 Warnings:
diff --git a/mysql-test/suite/csv/csv.test b/mysql-test/suite/csv/csv.test
index 711351a32ae..3da9aca7b16 100644
--- a/mysql-test/suite/csv/csv.test
+++ b/mysql-test/suite/csv/csv.test
@@ -17,13 +17,13 @@ drop table if exists t1,t2,t3,t4;
 --enable_warnings
 
 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 = CSV;
 
 INSERT INTO t1 VALUES (9410,9412);
   
-select period_ from t1;
+select period from t1;
 select * from t1;
 select t1.* from t1;
 
@@ -1308,13 +1308,13 @@ ALTER TABLE t2 RENAME t1;
 
 DROP TABLE t1;
 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 = CSV;
 
 INSERT INTO t1 VALUES (9410,9412);
   
-select period_ from t1;
+select period from t1;
 
 drop table if exists t1,t2,t3,t4;