Commit 47ed1db7 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents bef32dfa 2ffc8022

sql/set_var.cc

+3 −3
Original line number Diff line number Diff line
@@ -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

sql/share/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -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"