diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 21:19:43 +0300 |
| commit | f4646c0d063fb541f48dd2824ecccea464a9958d (patch) | |
| tree | ae1adf314b74af9f9885cef15ab9ffb8974d3e2d /client | |
| parent | 553daa5e40b413489431d5d21b512c6b529bccac (diff) | |
| parent | b9aa175cb282ce92e733412a74e23ba750f8dd80 (diff) | |
| download | mariadb-git-f4646c0d063fb541f48dd2824ecccea464a9958d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 4eb6d74cdf1..b317c7e5d13 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -86,9 +86,10 @@ static MYSQL mysql_connection,*sock=0; static char insert_pat[12 * 1024],*opt_password=0,*current_user=0, *current_host=0,*path=0,*fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0, - *where=0, *default_charset= (char *) "binary", + *where=0, *opt_compatible_mode_str= 0, *err_ptr= 0; +static char *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME; static ulong opt_compatible_mode= 0; static uint opt_mysql_port= 0, err_len= 0; static my_string opt_mysql_unix_port=0; @@ -368,7 +369,7 @@ static void write_footer(FILE *sql_file) fprintf(sql_file,"</mysqldump>"); else { - fprintf(md_result_file,"\n + 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\ |