diff options
| author | unknown <jimw@mysql.com> | 2005-01-31 16:27:17 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-31 16:27:17 -0800 |
| commit | 8b08a2e87fdf558412b180a972eccffe44d25944 (patch) | |
| tree | 02cde2dbc0704828132dd2152934f06bf79e931f /client/mysqldump.c | |
| parent | dd385f2493f836fa899c8906ac76db5cf160170c (diff) | |
| parent | af5e2a1034909c249a062398a0798982b75a0d47 (diff) | |
| download | mariadb-git-8b08a2e87fdf558412b180a972eccffe44d25944.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
strings/ctype-simple.c:
SCCS merged
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 70310737164..8225fe36834 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -493,7 +493,7 @@ static void write_header(FILE *sql_file, char *db_name) "); } fprintf(sql_file, - "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=\"%s%s%s\" */;\n", + "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n", path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",", compatible_mode_normal_str); check_io(sql_file); @@ -867,7 +867,7 @@ static int dbConnect(char *host, char *user,char *passwd) cannot reconnect. */ sock->reconnect= 0; - sprintf(buff, "/*!40100 SET @@SQL_MODE=\"%s\" */", + sprintf(buff, "/*!40100 SET @@SQL_MODE='%s' */", compatible_mode_normal_str); if (mysql_query_with_error_report(sock, 0, buff)) { |