diff options
| author | unknown <guilhem@mysql.com> | 2004-07-15 23:34:41 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-07-15 23:34:41 +0200 |
| commit | 898ceb0f968166a83ef04b1db3f88f2e817f8a53 (patch) | |
| tree | c1ac1b5a0edb3b81c331aae90572d39f9ccfcde2 /sql/set_var.cc | |
| parent | a96bb92f4a6542409e801c1410d58fa36eb55cad (diff) | |
| download | mariadb-git-898ceb0f968166a83ef04b1db3f88f2e817f8a53.tar.gz | |
after merge fixes (making rpl_charset and rpl_timezone pass).
Replication of charsets and timezones should shortly be changed to not need ONE_SHOT
(but 5.0 should still be able to read it, to be able to replicate 4.1 masters).
mysql-test/r/rpl_charset.result:
result update after the merge (only binlog positions differ from 4.1)
mysql-test/r/rpl_timezone.result:
result update after the merge (only binlog positions differ from 4.1)
sql/log.cc:
use ONE_SHOT to save charset and TZ info in the binlog (until I rewrite this soon)
sql/set_var.cc:
Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
sql/set_var.h:
Even if in the future, 5.0 will not use ONE_SHOT in ITS binlog, it must still be able to interpret it, to make 4.1->5.0 replication possible
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 07ab6620e4b..442a3ff0df2 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1913,7 +1913,7 @@ void sys_var_character_set_server::set_default(THD *thd, enum_var_type type) } } -#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000) +#if defined(HAVE_REPLICATION) bool sys_var_character_set_server::check(THD *thd, set_var *var) { if ((var->type == OPT_GLOBAL) && @@ -2020,7 +2020,7 @@ void sys_var_collation_database::set_default(THD *thd, enum_var_type type) } } -#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000) +#if defined(HAVE_REPLICATION) bool sys_var_collation_server::check(THD *thd, set_var *var) { if ((var->type == OPT_GLOBAL) && @@ -2372,7 +2372,7 @@ bool sys_var_thd_time_zone::check(THD *thd, set_var *var) String str(buff, sizeof(buff), &my_charset_latin1); String *res= var->value->val_str(&str); -#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000) +#if defined(HAVE_REPLICATION) if ((var->type == OPT_GLOBAL) && (mysql_bin_log.is_open() || active_mi->slave_running || active_mi->rli.slave_running)) @@ -2736,7 +2736,6 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list) bool not_all_support_one_shot(List<set_var_base> *var_list) { -#if MYSQL_VERSION_ID < 50000 List_iterator_fast<set_var_base> it(*var_list); set_var_base *var; while ((var= it++)) @@ -2744,7 +2743,6 @@ bool not_all_support_one_shot(List<set_var_base> *var_list) if (var->no_support_one_shot()) return 1; } -#endif return 0; } |