From c90db2c8beed5aba00a348fb4854d809c560501e Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Thu, 7 Dec 2017 13:58:18 +0530 Subject: [PATCH] BuildBot bug fix for invisible columns --- mysql-test/r/invisible_field.result | 8 ++++---- mysql-test/t/invisible_field.test | 2 +- sql/sql_class.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/invisible_field.result b/mysql-test/r/invisible_field.result index 22bc1063649..0e6980f31e6 100644 --- a/mysql-test/r/invisible_field.result +++ b/mysql-test/r/invisible_field.result @@ -14,10 +14,10 @@ t1 CREATE TABLE `t1` ( `xyz` int(11) INVISIBLE DEFAULT NULL, PRIMARY KEY (`abc`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -select * from INFORMATION_SCHEMA.COLUMNS where TABLE_SCHEMA='test' and TABLE_NAME='t1'; -TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION -def test t1 abc 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) PRI select,insert,update,references NEVER NULL -def test t1 xyz 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) INVISIBLE select,insert,update,references NEVER NULL +select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,EXTRA from INFORMATION_SCHEMA.COLUMNS where TABLE_SCHEMA='test' and TABLE_NAME='t1'; +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME EXTRA +def test t1 abc +def test t1 xyz INVISIBLE drop table t1; create table t1(a1 int invisible); ERROR 42000: A table must have at least 1 column diff --git a/mysql-test/t/invisible_field.test b/mysql-test/t/invisible_field.test index 55f3463a310..b1d28d882d7 100644 --- a/mysql-test/t/invisible_field.test +++ b/mysql-test/t/invisible_field.test @@ -3,7 +3,7 @@ create table t1(abc int primary key, xyz int invisible); SHOW STATUS LIKE 'Feature_invisible_columns'; desc t1; show create table t1; -select * from INFORMATION_SCHEMA.COLUMNS where TABLE_SCHEMA='test' and TABLE_NAME='t1'; +select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,COLUMN_NAME,EXTRA from INFORMATION_SCHEMA.COLUMNS where TABLE_SCHEMA='test' and TABLE_NAME='t1'; drop table t1; --error ER_TABLE_MUST_HAVE_COLUMNS create table t1(a1 int invisible); diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 30b53807578..35ed9be74f9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -138,7 +138,7 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root) columns(rhs.columns, mem_root), name(rhs.name), option_list(rhs.option_list), - generated(rhs.generated) + generated(rhs.generated), invisible(false) { list_copy_and_replace_each_value(columns, mem_root); }