Commit c90db2c8 authored by Sachin Setiya's avatar Sachin Setiya Committed by Sachin Setiya

BuildBot bug fix for invisible columns

parent 022b163a
...@@ -14,10 +14,10 @@ t1 CREATE TABLE `t1` ( ...@@ -14,10 +14,10 @@ t1 CREATE TABLE `t1` (
`xyz` int(11) INVISIBLE DEFAULT NULL, `xyz` int(11) INVISIBLE DEFAULT NULL,
PRIMARY KEY (`abc`) PRIMARY KEY (`abc`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
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';
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 TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME EXTRA
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 abc
def test t1 xyz 2 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) INVISIBLE select,insert,update,references NEVER NULL def test t1 xyz INVISIBLE
drop table t1; drop table t1;
create table t1(a1 int invisible); create table t1(a1 int invisible);
ERROR 42000: A table must have at least 1 column ERROR 42000: A table must have at least 1 column
......
...@@ -3,7 +3,7 @@ create table t1(abc int primary key, xyz int invisible); ...@@ -3,7 +3,7 @@ create table t1(abc int primary key, xyz int invisible);
SHOW STATUS LIKE 'Feature_invisible_columns'; SHOW STATUS LIKE 'Feature_invisible_columns';
desc t1; desc t1;
show create table 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; drop table t1;
--error ER_TABLE_MUST_HAVE_COLUMNS --error ER_TABLE_MUST_HAVE_COLUMNS
create table t1(a1 int invisible); create table t1(a1 int invisible);
......
...@@ -138,7 +138,7 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root) ...@@ -138,7 +138,7 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root)
columns(rhs.columns, mem_root), columns(rhs.columns, mem_root),
name(rhs.name), name(rhs.name),
option_list(rhs.option_list), option_list(rhs.option_list),
generated(rhs.generated) generated(rhs.generated), invisible(false)
{ {
list_copy_and_replace_each_value(columns, mem_root); list_copy_and_replace_each_value(columns, mem_root);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment