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 | 845d7c71b1f80c96c57f77a8f17243ede70bdfc4 (patch) | |
| tree | 49f6b211ce77a9af52efb3e05f72bcea1ac12b50 /sql/sql_load.cc | |
| parent | 4f3d241b28559b7fceebda8524ac86b4004c579c (diff) | |
| parent | 2f082d9d427059a2a7cbcaf1d575cdd25c1376c2 (diff) | |
| download | mariadb-git-845d7c71b1f80c96c57f77a8f17243ede70bdfc4.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, |