diff options
| author | bar@mysql.com <> | 2007-02-28 17:17:06 +0400 |
|---|---|---|
| committer | bar@mysql.com <> | 2007-02-28 17:17:06 +0400 |
| commit | 7e38927a389ca56fe180317f3b47475500842a5c (patch) | |
| tree | f40ea4d95e15ebf63594a870f9ed2edefe4b5de1 /sql/sql_load.cc | |
| parent | 5efe0e4a2f62a770914a76587625fbe8aacc0cf2 (diff) | |
| parent | dd0c43d5fa36337c69750ff4deb7b34d560855de (diff) | |
| download | mariadb-git-7e38927a389ca56fe180317f3b47475500842a5c.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.0.b15126
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 0d3f9ca8f81..69789f95d92 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -314,7 +314,8 @@ bool 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.collation_database, + READ_INFO read_info(file,tot_length, + ex->cs ? ex->cs : 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) |