database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

indentation cleanup

Browse Source
This commit is contained in:
serg@serg.mylan
2004-09-13 11:16:34 +02:00
parent 0570fa4eab
commit 68bcfc95b7
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sql/sql_parse.cc
View File

@@ -3518,29 +3518,29 @@ purposes internal to the MySQL server", MYF(0));
} }
thd->proc_info="query end"; // QQ thd->proc_info="query end"; // QQ
if (thd->one_shot_set) if (thd->one_shot_set)
{
/*
If this is a SET, do nothing. This is to allow mysqlbinlog to print
many SET commands (in this case we want the charset temp setting to
live until the real query). This is also needed so that SET
CHARACTER_SET_CLIENT... does not cancel itself immediately.
*/
if (lex->sql_command != SQLCOM_SET_OPTION)
{ {
/* thd->variables.character_set_client=
If this is a SET, do nothing. This is to allow mysqlbinlog to print global_system_variables.character_set_client;
many SET commands (in this case we want the charset temp setting to thd->variables.collation_connection=
live until the real query). This is also needed so that SET global_system_variables.collation_connection;
CHARACTER_SET_CLIENT... does not cancel itself immediately. thd->variables.collation_database=
*/ global_system_variables.collation_database;
if (lex->sql_command != SQLCOM_SET_OPTION) thd->variables.collation_server=
{ global_system_variables.collation_server;
thd->variables.character_set_client= thd->update_charset();
global_system_variables.character_set_client; thd->variables.time_zone=
thd->variables.collation_connection= global_system_variables.time_zone;
global_system_variables.collation_connection; thd->one_shot_set= 0;
thd->variables.collation_database=
global_system_variables.collation_database;
thd->variables.collation_server=
global_system_variables.collation_server;
thd->update_charset();
thd->variables.time_zone=
global_system_variables.time_zone;
thd->one_shot_set= 0;
}
} }
}
if (res < 0) if (res < 0)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN : 0); send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN : 0);