diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-26 03:33:43 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-26 03:33:43 +0500 |
| commit | 2df3b7b0ea0681c6fafeda7d6c017404691d5cb9 (patch) | |
| tree | 9586be2beae68dcf0a316792398609129103c820 /client | |
| parent | 607ab14cf767ed0187e0c050ed61cb4ebaf34bb7 (diff) | |
| parent | 0784d92414cba073201000ed0df23d136a6df077 (diff) | |
| download | mariadb-git-2df3b7b0ea0681c6fafeda7d6c017404691d5cb9.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
mysql-test/t/create.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/create.result:
Merge with 5.0 (main).
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index f72cb0171e1..9ccea308a1f 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2122,8 +2122,7 @@ static void dump_triggers_for_table(char *table, } if (mysql_num_rows(result)) { - if (opt_compact) - fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n"); + fprintf(sql_file, "\n/*!50003 SET @SAVE_SQL_MODE=@@SQL_MODE*/;\n"); fprintf(sql_file, "\nDELIMITER ;;\n"); } while ((row= mysql_fetch_row(result))) @@ -2167,9 +2166,11 @@ static void dump_triggers_for_table(char *table, row[3] /* Statement */); } if (mysql_num_rows(result)) + { fprintf(sql_file, "DELIMITER ;\n" - "/*!50003 SET SESSION SQL_MODE=@OLD_SQL_MODE */;\n"); + "/*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;\n"); + } mysql_free_result(result); /* make sure to set back opt_compatible mode to |