diff --git a/sql/set_var.cc b/sql/set_var.cc index 50094bb7f00279f91f6ed014b72b2476f25b27ae..6ea1747ec07b523a534a80d8e23a30e582ac8ed0 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2089,7 +2089,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; } @@ -2196,7 +2196,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; } @@ -2546,7 +2546,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 diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index fa20e52f7e7196505f124eecfc3ad70f5a8fb032..5757510bfb451ad96078b5cda8d9e1546cf4da98 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5276,7 +5276,7 @@ ER_NO_GROUP_FOR_PROC eng "Select must have a group with this procedure" ER_ORDER_WITH_PROC eng "Can't use ORDER clause with this procedure" -ER_LOGING_PROHIBIT_CHANGING_OF +ER_LOGGING_PROHIBIT_CHANGING_OF eng "Binary logging and replication forbid changing the global server %s" ER_NO_FILE_MAPPING eng "Can't map file: %-.64s, errno: %d"