database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Define a helper class to allow for saving sql_mode using RAII

Browse Source 
On construction the Sql_mode_save class stores the current THD's
sql_mode. On destruction, the THD's mode is restored.
This commit is contained in:
Vicențiu Ciorbaru
2017-02-10 12:46:44 +02:00
parent bdca350f59
commit dc90e24978
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/sql_acl.cc
View File

@ -1198,11 +1198,10 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
{ {
TABLE *table; TABLE *table;
READ_RECORD read_record_info; READ_RECORD read_record_info;
bool return_val= TRUE;
bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE; bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE;
char tmp_name[SAFE_NAME_LEN+1]; char tmp_name[SAFE_NAME_LEN+1];
int password_length; int password_length;
sql_mode_t old_sql_mode= thd->variables.sql_mode; Sql_mode_save old_mode_save(thd);
DBUG_ENTER("acl_load"); DBUG_ENTER("acl_load");
thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
@ -1214,7 +1213,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
{ {
if (init_read_record(&read_record_info, thd, table, NULL, NULL, if (init_read_record(&read_record_info, thd, table, NULL, NULL,
1, 1, FALSE)) 1, 1, FALSE))
goto end; DBUG_RETURN(TRUE);
table->use_all_columns(); table->use_all_columns();
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
@ -1269,7 +1268,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
if (init_read_record(&read_record_info, thd, table=tables[USER_TABLE].table, if (init_read_record(&read_record_info, thd, table=tables[USER_TABLE].table,
NULL, NULL, 1, 1, FALSE)) NULL, NULL, 1, 1, FALSE))
goto end; DBUG_RETURN(TRUE);
table->use_all_columns(); table->use_all_columns();
username_char_length= MY_MIN(table->field[1]->char_length(), username_char_length= MY_MIN(table->field[1]->char_length(),
@ -1280,7 +1279,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
{ {
sql_print_error("Fatal error: mysql.user table is damaged or in " sql_print_error("Fatal error: mysql.user table is damaged or in "
"unsupported 3.20 format."); "unsupported 3.20 format.");
goto end; DBUG_RETURN(TRUE);
} }
DBUG_PRINT("info",("user table fields: %d, password length: %d", DBUG_PRINT("info",("user table fields: %d, password length: %d",
@ -1294,7 +1293,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
mysql_mutex_unlock(&LOCK_global_system_variables); mysql_mutex_unlock(&LOCK_global_system_variables);
sql_print_error("Fatal error: mysql.user table is in old format, " sql_print_error("Fatal error: mysql.user table is in old format, "
"but server started with --secure-auth option."); "but server started with --secure-auth option.");
goto end; DBUG_RETURN(TRUE);
} }
mysql_user_table_is_in_short_password_format= true; mysql_user_table_is_in_short_password_format= true;
if (global_system_variables.old_passwords) if (global_system_variables.old_passwords)
@ -1527,7 +1526,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
if (init_read_record(&read_record_info, thd, table=tables[DB_TABLE].table, if (init_read_record(&read_record_info, thd, table=tables[DB_TABLE].table,
NULL, NULL, 1, 1, FALSE)) NULL, NULL, 1, 1, FALSE))
goto end; DBUG_RETURN(TRUE);
table->use_all_columns(); table->use_all_columns();
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
@ -1594,7 +1593,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
{ {
if (init_read_record(&read_record_info, thd, table, if (init_read_record(&read_record_info, thd, table,
NULL, NULL, 1, 1, FALSE)) NULL, NULL, 1, 1, FALSE))
goto end; DBUG_RETURN(TRUE);
table->use_all_columns(); table->use_all_columns();
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
@ -1603,10 +1602,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
if (proxy.check_validity(check_no_resolve)) if (proxy.check_validity(check_no_resolve))
continue; continue;
if (push_dynamic(&acl_proxy_users, (uchar*) &proxy)) if (push_dynamic(&acl_proxy_users, (uchar*) &proxy))
{ DBUG_RETURN(TRUE);
end_read_record(&read_record_info);
goto end;
}
} }
my_qsort((uchar*) dynamic_element(&acl_proxy_users, 0, ACL_PROXY_USER*), my_qsort((uchar*) dynamic_element(&acl_proxy_users, 0, ACL_PROXY_USER*),
acl_proxy_users.elements, acl_proxy_users.elements,
@ -1624,7 +1620,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
{ {
if (init_read_record(&read_record_info, thd, table, NULL, NULL, 1, 1, if (init_read_record(&read_record_info, thd, table, NULL, NULL, 1, 1,
FALSE)) FALSE))
goto end; DBUG_RETURN(TRUE);
table->use_all_columns(); table->use_all_columns();
MEM_ROOT temp_root; MEM_ROOT temp_root;
@ -1662,12 +1658,7 @@ static bool acl_load(THD *thd, TABLE_LIST *tables)
init_check_host(); init_check_host();
initialized=1; initialized=1;
return_val= FALSE; DBUG_RETURN(FALSE);
end:
end_read_record(&read_record_info);
thd->variables.sql_mode= old_sql_mode;
DBUG_RETURN(return_val);
} }

16
sql/sql_class.h
View File

@ -5712,6 +5712,22 @@ inline bool binlog_should_compress(ulong len)
len >= opt_bin_log_compress_min_len; len >= opt_bin_log_compress_min_len;
} }
/**
Save thd sql_mode on instantiation.
On destruction it resets the mode to the previously stored value.
*/
class Sql_mode_save
{
public:
Sql_mode_save(THD *thd) : thd(thd), old_mode(thd->variables.sql_mode) {}
~Sql_mode_save() { thd->variables.sql_mode = old_mode; }
private:
THD *thd;
sql_mode_t old_mode; // SQL mode saved at construction time.
};
#endif /* MYSQL_SERVER */ #endif /* MYSQL_SERVER */
#endif /* SQL_CLASS_INCLUDED */ #endif /* SQL_CLASS_INCLUDED */