diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 06:24:46 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 06:24:46 +0100 |
| commit | dcdbfa65276ee2d1ba79c1a8a65e49a22d56d524 (patch) | |
| tree | a868ab5431bd7309ec3f170d3ef8d81c706e1fb1 /sql/set_var.cc | |
| parent | e0b2dab77d0f8166c710c3b97faede85fa4e847c (diff) | |
| parent | 885e13aba29171ebfbeb3c548781b270b76520ed (diff) | |
| download | mariadb-git-dcdbfa65276ee2d1ba79c1a8a65e49a22d56d524.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index fc144a908a4..fc0802bf185 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2097,7 +2097,7 @@ bool sys_var_character_set_server::check(THD *thd, set_var *var) (mysql_bin_log.is_open() || active_mi->slave_running || active_mi->rli.slave_running)) { - my_error(ER_LOGING_PROHIBIT_CHANGING_OF, MYF(0), + my_error(ER_LOGGING_PROHIBIT_CHANGING_OF, MYF(0), "character set, collation"); return 1; } @@ -2204,7 +2204,7 @@ bool sys_var_collation_server::check(THD *thd, set_var *var) (mysql_bin_log.is_open() || active_mi->slave_running || active_mi->rli.slave_running)) { - my_error(ER_LOGING_PROHIBIT_CHANGING_OF, MYF(0), + my_error(ER_LOGGING_PROHIBIT_CHANGING_OF, MYF(0), "character set, collation"); return 1; } @@ -2554,7 +2554,7 @@ bool sys_var_thd_time_zone::check(THD *thd, set_var *var) (mysql_bin_log.is_open() || active_mi->slave_running || active_mi->rli.slave_running)) { - my_error(ER_LOGING_PROHIBIT_CHANGING_OF, MYF(0), "time zone"); + my_error(ER_LOGGING_PROHIBIT_CHANGING_OF, MYF(0), "time zone"); return 1; } #endif |