diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
| commit | 6017f911e33c3a44e6b7b090215446300c38b7be (patch) | |
| tree | 2e0b33c7cd3f1083dce485137fd952b52a37dfbd /client/mysql.cc | |
| parent | 6e5d9284ed35fbf8dbe1af01e45923c3109aa7ad (diff) | |
| parent | 3c8150b79bf5302879897e0d1ebd594798bb419e (diff) | |
| download | mariadb-git-6017f911e33c3a44e6b7b090215446300c38b7be.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
client/mysql.cc:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 92ad7864f84..921804a1298 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1221,7 +1221,8 @@ static bool add_line(String &buffer,char *line,char *in_string, continue; } #endif - if (!*ml_comment && inchar == '\\') + if (!*ml_comment && inchar == '\\' && + !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)) { // Found possbile one character command like \c |