diff options
| author | hf@deer.(none) <> | 2003-07-23 15:23:53 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-07-23 15:23:53 +0500 |
| commit | e849dad4f3ffa43c129ee7ef34b55f4e09f0f948 (patch) | |
| tree | ea58e694833d29526279a9c9ffb3e1d45c3c8b96 /client | |
| parent | a4f899dfc0a96ab95e64b11a1890736feab72d3b (diff) | |
| parent | 99aa453f3787710ac2245e701548c95ce93a9d7c (diff) | |
| download | mariadb-git-e849dad4f3ffa43c129ee7ef34b55f4e09f0f948.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 82737836485..4eb6d74cdf1 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -352,6 +352,11 @@ static void write_header(FILE *sql_file, char *db_name) mysql_get_server_info(&mysql_connection)); if (!opt_set_names) fprintf(sql_file,"\n/*!40101 SET NAMES %s*/;\n",default_charset); + fprintf(md_result_file,"\ +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n\ +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n\ +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=NO_AUTO_VALUE_ON_ZERO */;\n\ +"); } return; } /* write_header */ @@ -361,6 +366,14 @@ static void write_footer(FILE *sql_file) { if (opt_xml) fprintf(sql_file,"</mysqldump>"); + else + { + fprintf(md_result_file,"\n +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;\n\ +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\n\ +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\n\ +"); + } fputs("\n", sql_file); } /* write_footer */ |