diff options
| author | unknown <jimw@mysql.com> | 2005-01-31 15:28:33 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-31 15:28:33 -0800 |
| commit | 20745ec65f680d88ed8bdf2d0b5a916920e2f8ff (patch) | |
| tree | 49b59fb2ca90d712b48f5fe0d7c8018abc34b785 /client | |
| parent | 6685c7a671f947d631828f3ecadf9a146b28f330 (diff) | |
| parent | af68c169abb5720b482bcb5163b177473c8cea97 (diff) | |
| download | mariadb-git-20745ec65f680d88ed8bdf2d0b5a916920e2f8ff.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -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 3a93adf5b36..afaa2dc5a6d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -489,7 +489,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); @@ -863,7 +863,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)) { |