summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-09-15 16:31:04 +0500
committerbar@bar.mysql.r18.ru <>2003-09-15 16:31:04 +0500
commit1d20c09ce94e8897079278aee293c151a6aa5513 (patch)
tree0a3a1a25f4afbbef712e5f85b5de3d6ebbcebeb4 /sql/sql_load.cc
parent8d05911df07d15c8b41344a7509b6e0bc3b2bc82 (diff)
downloadmariadb-git-1d20c09ce94e8897079278aee293c151a6aa5513.tar.gz
New SQL variables "collation_server" and "collation_database"
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 771b1ab11d6..60e0a7c7e94 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -224,7 +224,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
info.handle_duplicates=handle_duplicates;
info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
- READ_INFO read_info(file,tot_length,thd->variables.character_set_database,
+ READ_INFO read_info(file,tot_length,thd->variables.collation_database,
*field_term,*ex->line_start, *ex->line_term, *enclosed,
info.escape_char, read_file_from_client, is_fifo);
if (read_info.error)