database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed bug #610890.

Browse Source 
The CREATE SHOW TABLE command misplaced virtual column specifiers:
the AS clause for a virtual column was put before optional
character set attributes, not after them as required by the syntax.
This commit is contained in:
Igor Babaev
2010-07-28 12:09:38 -07:00
parent 238098657e
commit a008a6eb35
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/vcol/r/vcol_misc.result
View File

@ -125,3 +125,11 @@ a p ROUND(a,p) ROUND(a,p+NULL)
1 0 1 NULL 1 0 1 NULL
0 NULL NULL NULL 0 NULL NULL NULL
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a char(32), v char(32) CHARACTER SET ucs2 AS (a) VIRTUAL);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(32) DEFAULT NULL,
`v` char(32) CHARACTER SET ucs2 AS (a) VIRTUAL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;

10
mysql-test/suite/vcol/t/vcol_misc.test
View File

@ -128,3 +128,13 @@ INSERT INTO t1(p,a) VALUES (0,1);
INSERT INTO t1(p,a) VALUES (NULL,0); INSERT INTO t1(p,a) VALUES (NULL,0);
SELECT a, p, ROUND(a,p), ROUND(a,p+NULL) FROM t1; SELECT a, p, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
DROP TABLE t1; DROP TABLE t1;
#
# Bug#610890: SHOW CREATE TABLE with a virtual column
#
CREATE TABLE t1 (a char(32), v char(32) CHARACTER SET ucs2 AS (a) VIRTUAL);
SHOW CREATE TABLE t1;
DROP TABLE t1;

26
sql/sql_show.cc
View File

@ -1348,19 +1348,6 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
field->sql_type(type); field->sql_type(type);
packet->append(type.ptr(), type.length(), system_charset_info); packet->append(type.ptr(), type.length(), system_charset_info);
if (field->vcol_info)
{
packet->append(STRING_WITH_LEN(" AS ("));
packet->append(field->vcol_info->expr_str.str,
field->vcol_info->expr_str.length,
system_charset_info);
packet->append(STRING_WITH_LEN(")"));
if (field->stored_in_db)
packet->append(STRING_WITH_LEN(" PERSISTENT"));
else
packet->append(STRING_WITH_LEN(" VIRTUAL"));
}
if (field->has_charset() && if (field->has_charset() &&
!(thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))) !(thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)))
{ {
@ -1380,6 +1367,19 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
} }
} }
if (field->vcol_info)
{
packet->append(STRING_WITH_LEN(" AS ("));
packet->append(field->vcol_info->expr_str.str,
field->vcol_info->expr_str.length,
system_charset_info);
packet->append(STRING_WITH_LEN(")"));
if (field->stored_in_db)
packet->append(STRING_WITH_LEN(" PERSISTENT"));
else
packet->append(STRING_WITH_LEN(" VIRTUAL"));
}
if (flags & NOT_NULL_FLAG) if (flags & NOT_NULL_FLAG)
packet->append(STRING_WITH_LEN(" NOT NULL")); packet->append(STRING_WITH_LEN(" NOT NULL"));
else if (field->type() == MYSQL_TYPE_TIMESTAMP) else if (field->type() == MYSQL_TYPE_TIMESTAMP)