1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/usr/home/bar/mysql-4.1-again
This commit is contained in:
unknown 2005-02-25 18:16:45 +04:00
commit 54dadffc74
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqldump.c
View File

@ -861,6 +861,11 @@ static int dbConnect(char *host, char *user,char *passwd)
DBerror(&mysql_connection, "when trying to connect"); DBerror(&mysql_connection, "when trying to connect");
return 1; 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 As we're going to set SQL_MODE, it would be lost on reconnect, so we
cannot reconnect. cannot reconnect.