diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-08-15 22:14:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-08-15 22:14:08 +0300 |
| commit | fb135f7ee570a199d78db7c3222db1980b75060f (patch) | |
| tree | c87f9822d8855101d390f9cb1f93ebbc43049900 /client | |
| parent | d2206ad14920e85907c965256e1ce061633c36ee (diff) | |
| parent | b5f830d88d7b7a5cc1981ca80fda52fcfa2f4150 (diff) | |
| download | mariadb-git-fb135f7ee570a199d78db7c3222db1980b75060f.tar.gz | |
Automatic merge with 5.2
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 0eab2ae8e0b..d7d99e0cc17 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -36,7 +36,7 @@ ** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov */ -#define DUMP_VERSION "10.13" +#define DUMP_VERSION "10.14" #include <my_global.h> #include <my_sys.h> @@ -635,8 +635,13 @@ static void write_header(FILE *sql_file, char *db_name) if (!path) { + if (!opt_no_create_info) + { + /* We don't need unique checks as the table is created just before */ + fprintf(md_result_file,"\ +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n"); + } 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\ "); } @@ -666,8 +671,12 @@ static void write_footer(FILE *sql_file) if (!path) { fprintf(md_result_file,"\ -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\n\ +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\n"); + if (!opt_no_create_info) + { + fprintf(md_result_file,"\ /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\n"); + } } if (opt_set_charset) fprintf(sql_file, |