diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-09-15 16:31:04 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-09-15 16:31:04 +0500 |
| commit | ebda1ae2820e0ca180e168fbc6edf739f4114943 (patch) | |
| tree | 0a3a1a25f4afbbef712e5f85b5de3d6ebbcebeb4 /sql/sql_base.cc | |
| parent | 0ea88acaa3f07a6612909c07abf59b585f1b0bc4 (diff) | |
| download | mariadb-git-ebda1ae2820e0ca180e168fbc6edf739f4114943.tar.gz | |
New SQL variables "collation_server" and "collation_database"
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index dc6e791c4be..fa4f08b5f14 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2328,7 +2328,7 @@ int mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys) DBUG_ENTER("mysql_create_index"); bzero((char*) &create_info,sizeof(create_info)); create_info.db_type=DB_TYPE_DEFAULT; - create_info.table_charset= thd->variables.character_set_database; + create_info.table_charset= thd->variables.collation_database; DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name, &create_info, table_list, fields, keys, drop, alter, 0, (ORDER*)0, FALSE, @@ -2345,7 +2345,7 @@ int mysql_drop_index(THD *thd, TABLE_LIST *table_list, List<Alter_drop> &drop) DBUG_ENTER("mysql_drop_index"); bzero((char*) &create_info,sizeof(create_info)); create_info.db_type=DB_TYPE_DEFAULT; - create_info.table_charset= thd->variables.character_set_database; + create_info.table_charset= thd->variables.collation_database; DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name, &create_info, table_list, fields, keys, drop, alter, 0, (ORDER*)0, FALSE, |