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

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2003-12-19 19:15:55 +04:00
parent 7dfcc949d6 5be2b8b11a
commit c49773237d
5 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_db.cc
View File

@ -62,7 +62,7 @@ static bool write_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
ulong length;
CHARSET_INFO *cs= (create && create->default_table_charset) ?
create->default_table_charset :
thd->variables.collation_database;
thd->variables.collation_server;
length= my_sprintf(buf,(buf,
"default-character-set=%s\ndefault-collation=%s\n",
cs->csname,cs->name));
@ -101,7 +101,7 @@ static bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
uint nbytes;
bzero((char*) create,sizeof(*create));
create->default_table_charset= global_system_variables.collation_database;
create->default_table_charset= thd->variables.collation_server;
if ((file=my_open(path, O_RDONLY | O_SHARE, MYF(0))) >= 0)
{
IO_CACHE cache;
@ -290,7 +290,7 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
{
thd->db_charset= (create_info && create_info->default_table_charset) ?
create_info->default_table_charset :
global_system_variables.collation_database;
thd->variables.collation_server;
thd->variables.collation_database= thd->db_charset;
}
@ -665,7 +665,7 @@ bool mysql_change_db(THD *thd, const char *name)
load_db_opt(thd, path, &create);
thd->db_charset= create.default_table_charset ?
create.default_table_charset :
global_system_variables.collation_database;
thd->variables.collation_server;
thd->variables.collation_database= thd->db_charset;
DBUG_RETURN(0);
}