diff options
| author | unknown <bar@mysql.com> | 2005-02-25 18:16:45 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-25 18:16:45 +0400 |
| commit | 54dadffc749e283b95ff513f0a686fd84a1132d9 (patch) | |
| tree | 24e89c59ada5da976b60ed45adeda0d70b360013 | |
| parent | 2908ccf5b4f68a1b486773c422c4a6c7611c0973 (diff) | |
| parent | 3c5b16eebed40cf72d9deaa800229266bdf75f9a (diff) | |
| download | mariadb-git-54dadffc749e283b95ff513f0a686fd84a1132d9.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-again
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index c2c44024cf4..2c0bdf9a7a9 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -862,6 +862,11 @@ static int dbConnect(char *host, char *user,char *passwd) return 1; } /* + Don't dump SET NAMES with a pre-4.1 server (bug#7997). + */ + if (mysql_get_server_version(&mysql_connection) < 40100) + opt_set_charset= 0; + /* As we're going to set SQL_MODE, it would be lost on reconnect, so we cannot reconnect. */ |