database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

mysqlshow and mysqldump now send their vharacter set to server

Browse Source 
character_set_results is now the same with character_set_client by default
This commit is contained in:
bar@bar.mysql.r18.ru
2003-05-30 23:09:35 +05:00
parent e15ea0291a
commit bb611fa0a2
8 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_parse.cc
View File

@@ -669,9 +669,12 @@ check_connections(THD *thd)
global_system_variables.character_set_client;
thd->variables.collation_connection=
global_system_variables.collation_connection;
thd->variables.character_set_results=
global_system_variables.character_set_results;
}
else
{
thd->variables.character_set_results=
thd->variables.collation_connection=
thd->variables.character_set_client;
}
@@ -1319,7 +1322,8 @@ restore_user:
break;
#else
{
char *fields;
char *fields, *pend;
String convname;
TABLE_LIST table_list;
statistic_increment(com_stat[SQLCOM_SHOW_FIELDS],&LOCK_status);
bzero((char*) &table_list,sizeof(table_list));
@@ -1329,8 +1333,11 @@ restore_user:
break;
}
thd->free_list=0;
table_list.alias= table_list.real_name= thd->strdup(packet);
packet=strend(packet)+1;
pend= strend(packet);
convname.copy(packet, pend-packet,
thd->variables.character_set_client, system_charset_info);
table_list.alias= table_list.real_name= convname.c_ptr();
packet= pend+1;
// command not cachable => no gap for data base name
if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1)))
break;