summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-02-25 18:12:53 +0400
committerunknown <bar@mysql.com>2005-02-25 18:12:53 +0400
commit3c5b16eebed40cf72d9deaa800229266bdf75f9a (patch)
tree24e89c59ada5da976b60ed45adeda0d70b360013 /client
parenta8194cd6d2b3d650f26398cf92538336231c9237 (diff)
downloadmariadb-git-3c5b16eebed40cf72d9deaa800229266bdf75f9a.tar.gz
mysqldump.c:
Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client client/mysqldump.c: Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client
Diffstat (limited to 'client')
-rw-r--r--client/mysqldump.c5
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.
*/