diff options
| author | unknown <carsten@tsort.bitbybit.dk> | 2003-06-10 15:56:58 +0200 |
|---|---|---|
| committer | unknown <carsten@tsort.bitbybit.dk> | 2003-06-10 15:56:58 +0200 |
| commit | 0826127b2b826871fb3dcf1a1497d364d62da3b9 (patch) | |
| tree | 10cff4bcdd2d0de97f445d80c06654587f62be54 /client/mysqldump.c | |
| parent | d04fe0349494d599d6d3dd4cba1d4dcd8f032c2a (diff) | |
| parent | c07680f15b933cc8b20975bc14fd7039898f1821 (diff) | |
| download | mariadb-git-0826127b2b826871fb3dcf1a1497d364d62da3b9.tar.gz | |
Merge cpedersen@bk-internal.mysql.com:/home/bk/mysql-4.1
into tsort.bitbybit.dk:/home/carsten/mysql/bk/mysql-4.1
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 18705b9e375..67e83d58768 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -34,6 +34,7 @@ ** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up ** and adapted to mysqldump 05/11/01 by Jani Tolonen ** Added --single-transaction option 06/06/2002 by Peter Zaitsev +** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov */ #define DUMP_VERSION "10.2" @@ -434,6 +435,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), char buff[255]; opt_quoted= 1; + opt_set_names= 1; opt_compatible_mode_str= argument; opt_compatible_mode= find_set(&compatible_mode_typelib, argument, strlen(argument), @@ -563,7 +565,8 @@ static int dbConnect(char *host, char *user,char *passwd) if (shared_memory_base_name) mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name); #endif - mysql_options(&mysql_connection, MYSQL_SET_CHARSET_NAME, default_charset); + if (!opt_set_names) + mysql_options(&mysql_connection, MYSQL_SET_CHARSET_NAME, default_charset); if (!(sock= mysql_real_connect(&mysql_connection,host,user,passwd, NULL,opt_mysql_port,opt_mysql_unix_port, 0))) |