mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Charset of any string field now can be specified during CREATE TABLE
mysql-test/r/alter_table.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/create.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/fulltext.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/innodb.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/merge.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/select.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/show_check.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/symlink.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/type_blob.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS mysql-test/r/type_ranges.result: Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS sql/field.cc: New format for string fields in SHOW CREATE TABLE and SHOW FIELDS sql/mysql_priv.h: pass charset sql/sql_parse.cc: QQ is now fixed :) sql/sql_yacc.yy: New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
This commit is contained in:
@ -2824,7 +2824,7 @@ bool add_field_to_list(char *field_name, enum_field_types type,
|
||||
char *length, char *decimals,
|
||||
uint type_modifier,
|
||||
Item *default_value, Item *comment,
|
||||
char *change, TYPELIB *interval)
|
||||
char *change, TYPELIB *interval, CHARSET_INFO *cs)
|
||||
{
|
||||
register create_field *new_field;
|
||||
THD *thd=current_thd;
|
||||
@ -2877,7 +2877,7 @@ bool add_field_to_list(char *field_name, enum_field_types type,
|
||||
new_field->change=change;
|
||||
new_field->interval=0;
|
||||
new_field->pack_length=0;
|
||||
new_field->charset=0; // QQ: To be fixed
|
||||
new_field->charset=cs;
|
||||
|
||||
if (!comment)
|
||||
{
|
||||
|
Reference in New Issue
Block a user