Commit 54dadffc authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/home/bar/mysql-4.1-again
parents 2908ccf5 3c5b16ee

client/mysqldump.c

+5 −0
Original line number Diff line number Diff line
@@ -861,6 +861,11 @@ static int dbConnect(char *host, char *user,char *passwd) 
    DBerror(&mysql_connection, "when trying to connect");

    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.