database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-03 03:06:42 +03:00
parent a6daa9ada0 3701208a2e
commit 056ac55aa0
756 changed files with 16223 additions and 15025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_partition.cc
View File

@@ -1978,11 +1978,11 @@ static int add_part_field_list(File fptr, List<char> field_list)
const char *field_str= part_it++;
String field_string("", 0, system_charset_info);
THD *thd= current_thd;
ulonglong save_options= thd->options;
thd->options= 0;
ulonglong save_options= thd->variables.option_bits;
thd->variables.option_bits= 0;
append_identifier(thd, &field_string, field_str,
strlen(field_str));
thd->options= save_options;
thd->variables.option_bits= save_options;
err+= add_string_object(fptr, &field_string);
if (i != (num_fields-1))
err+= add_comma(fptr);
@@ -1997,12 +1997,12 @@ static int add_name_string(File fptr, const char *name)
int err;
String name_string("", 0, system_charset_info);
THD *thd= current_thd;
ulonglong save_options= thd->options;
ulonglong save_options= thd->variables.option_bits;
thd->options= 0;
thd->variables.option_bits= 0;
append_identifier(thd, &name_string, name,
strlen(name));
thd->options= save_options;
thd->variables.option_bits= save_options;
err= add_string_object(fptr, &name_string);
return err;
}