diff options
| author | unknown <paul@snake-hub.snake.net> | 2005-02-23 13:15:03 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2005-02-23 13:15:03 -0600 |
| commit | 196ee96ed242ae48ea95ff7df96b93dec1d36f93 (patch) | |
| tree | 9e3f9e945fd6d3909fce0eda201f3b3b1edcda9d /sql | |
| parent | a2a1449c36c8124c808ab207d92a0749346b9d15 (diff) | |
| download | mariadb-git-196ee96ed242ae48ea95ff7df96b93dec1d36f93.tar.gz | |
Fix badly spelled symbol.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 6 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 50094bb7f00..6ea1747ec07 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 fa20e52f7e7..5757510bfb4 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" |