diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-09-17 14:54:50 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-09-17 14:54:50 +0200 |
| commit | f90e4c3758c31f99ffaf6fec11a9cc65a812caea (patch) | |
| tree | 49f6b211ce77a9af52efb3e05f72bcea1ac12b50 /sql/sql_load.cc | |
| parent | a7bc87b39c7b8333ceda607bede4bb887e0f1bdb (diff) | |
| parent | a89d13a7f04c3d2d887b85dc35e0f4089f7e763d (diff) | |
| download | mariadb-git-f90e4c3758c31f99ffaf6fec11a9cc65a812caea.tar.gz | |
auto-merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 255d8e5813d..239fb1d49f3 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -327,7 +327,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, bzero((char*) &info,sizeof(info)); info.ignore= ignore; info.handle_duplicates=handle_duplicates; - info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX; + info.escape_char= (escaped->length() && (ex->escaped_given() || + !(thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES))) + ? (*escaped)[0] : INT_MAX; READ_INFO read_info(file,tot_length, ex->cs ? ex->cs : thd->variables.collation_database, |