diff options
| author | unknown <lars@mysql.com> | 2005-02-22 13:22:34 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-22 13:22:34 +0100 |
| commit | 6f6bf32afa7aa2876f1ab5e555438f7baf514d42 (patch) | |
| tree | 08c7ae6ff93769414869eccedfcab6468afdd88c /client | |
| parent | 2fb807d1d0a817c177e02cee7b508b6122ce832e (diff) | |
| parent | 7d766fdbeb1418488f99125b510dce5942b7f79f (diff) | |
| download | mariadb-git-6f6bf32afa7aa2876f1ab5e555438f7baf514d42.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
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 52255ccb896..c2c44024cf4 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -489,7 +489,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); @@ -518,6 +519,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); } |