summaryrefslogtreecommitdiff
path: root/client/mysqldump.c
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-02-21 18:40:28 +0100
committerunknown <lars@mysql.com>2005-02-21 18:40:28 +0100
commitedaf33a14e922571e8e80910bba6693b72e2db83 (patch)
treeb5fa7db32611dc285b185068666727e0844c2fdc /client/mysqldump.c
parent96f9c9d9d372b45e0271f2caccec948ddc6c7fc4 (diff)
downloadmariadb-git-edaf33a14e922571e8e80910bba6693b72e2db83.tar.gz
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r--client/mysqldump.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 52255ccb896..2a6d9adf8bd 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -492,6 +492,8 @@ static void write_header(FILE *sql_file, char *db_name)
"/*!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);
+ fprintf(sql_file,
+ "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n");
check_io(sql_file);
}
} /* write_header */
@@ -518,6 +520,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 */;");
fputs("\n", sql_file);
check_io(sql_file);
}