Commit 381659ff authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mysql_src/mysql-4.1-clean
parents 2c6b02ca 813e748d

sql/slave.cc

+5 −0
Original line number Diff line number Diff line
@@ -1243,7 +1243,11 @@ not always make sense; please check the manual before using it)."; 
    values of these 2 are never used (new connections don't use them).

    We don't test equality of global collation_database either as it's is

    going to be deprecated (made read-only) in 4.1 very soon.

    We don't do it for <3.23.57 because masters <3.23.50 hang on

    SELECT @@unknown_var (BUG#7965 - see changelog of 3.23.50).

  */

  if (mi->old_format == BINLOG_FORMAT_323_LESS_57)

    goto err;

  if (!mysql_real_query(mysql, "SELECT @@GLOBAL.COLLATION_SERVER", 32) &&

      (master_res= mysql_store_result(mysql)))

  {
@@ -1280,6 +1284,7 @@ be equal for replication to work"; 
    mysql_free_result(master_res);

  }



err:

  if (errmsg)

  {

    sql_print_error(errmsg);