diff options
| author | msvensson@neptunus.(none) <> | 2006-08-03 09:32:58 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-08-03 09:32:58 +0200 |
| commit | 7280f631000154a47952a71dbf71de71a4e6041b (patch) | |
| tree | ef70ce093b8f53435eb03a5e77c0f0c6b76b7b77 /client/mysql.cc | |
| parent | 9d67aacead9cb28d6bf9f95fe6af997e8c616deb (diff) | |
| parent | 35af3d55785bd544502c60b6eb9a8cdefdaad4be (diff) | |
| download | mariadb-git-7280f631000154a47952a71dbf71de71a4e6041b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
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 25faf91b25d..22cf0b473af 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 |