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 | |
| 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')
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 3 |
2 files changed, 4 insertions, 2 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 diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 518ab7cf832..9cecdb4eafc 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -36,6 +36,7 @@ /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */ #include "mysql_priv.h" #include "log_event.h" +#include "sql_common.h" #define BIN_LOG_HEADER_SIZE 4 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) @@ -1077,7 +1078,7 @@ could be out of memory"); const char *error_msg; Log_event *ev; - len = net_safe_read(mysql); + len= cli_safe_read(mysql); if (len == packet_error) { fprintf(stderr, "Got error reading packet from server: %s\n", |