diff options
| author | unknown <lars@mysql.com> | 2005-02-22 22:40:34 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-22 22:40:34 +0100 |
| commit | 3525e0631ee2c87a4332a97949b71108a56a893d (patch) | |
| tree | 0baf9c8bea10509b4a2502b0730211c623c1365d /client | |
| parent | 517f94a37f43d6fde9a4b11683924b873671fa54 (diff) | |
| parent | 88c0f1e0c14579a802cc0b6ddc1bde253044acef (diff) | |
| download | mariadb-git-3525e0631ee2c87a4332a97949b71108a56a893d.tar.gz | |
Merge 4.1->5.0
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_charset.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/rpl_charset.test:
Manual merge
sql/log_event.cc:
Manual merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index c2b07e2ec20..d82fc54a9ae 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -493,7 +493,8 @@ 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" + "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n", path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",", compatible_mode_normal_str); check_io(sql_file); @@ -522,6 +523,8 @@ static void write_footer(FILE *sql_file) "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n" "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n" "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n"); + fprintf(sql_file, + "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n"); fputs("\n", sql_file); check_io(sql_file); } |