mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mysql_src/mysql-4.1-clean

Browse source 
into mysql.com:/home/mysql_src/mysql-5.0-clean
This commit is contained in:
guilhem@mysql.com 2005-01-18 11:06:37 +01:00
commit 5fbdd9bdcd
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/slave.cc
View file

@ -1418,7 +1418,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)))
{
@ -1455,6 +1459,7 @@ be equal for replication to work";
mysql_free_result(master_res);
}
err:
if (errmsg)
{
sql_print_error(errmsg);