database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
into mysql.com:/home/mysql_src/mysql-5.0-clean
This commit is contained in:
guilhem@mysql.com
2005-02-03 16:25:57 +01:00
parent d8659b27af ed1696f6b9
commit ac053d80e9
33 changed files with 530 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/set_var.cc
View File

@@ -2047,9 +2047,15 @@ void sys_var_character_set_server::set_default(THD *thd, enum_var_type type)
}
}
#if defined(HAVE_REPLICATION)
#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003)
bool sys_var_character_set_server::check(THD *thd, set_var *var)
{
/*
To be perfect we should fail even if we are a 5.0.3 slave, a 4.1 master,
and user wants to change our global character set variables. Because
replicating a 4.1 assumes those are not changed. But that's not easy to
do.
*/
if ((var->type == OPT_GLOBAL) &&
(mysql_bin_log.is_open() ||
active_mi->slave_running || active_mi->rli.slave_running))
@@ -2154,7 +2160,7 @@ void sys_var_collation_database::set_default(THD *thd, enum_var_type type)
}
}
#if defined(HAVE_REPLICATION)
#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50003)
bool sys_var_collation_server::check(THD *thd, set_var *var)
{
if ((var->type == OPT_GLOBAL) &&