diff options
| author | unknown <bar@mysql.com> | 2007-02-28 17:17:06 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-02-28 17:17:06 +0400 |
| commit | de61d5b0d5eeb32be7df8fb3dd7adb2b13aa3d16 (patch) | |
| tree | f40ea4d95e15ebf63594a870f9ed2edefe4b5de1 /sql/sql_load.cc | |
| parent | 9c8637dc4cb97f97eec964f64aaefe906d65f614 (diff) | |
| parent | c3a3aff54feeb194e0217249305f74f18021099a (diff) | |
| download | mariadb-git-de61d5b0d5eeb32be7df8fb3dd7adb2b13aa3d16.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.0.b15126
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/mysqlbinlog.result:
After merge fix
mysql-test/t/mysqlbinlog.test:
After merge fix
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) |