diff options
| author | unknown <igor@rurik.mysql.com> | 2003-08-02 03:27:13 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-08-02 03:27:13 -0700 |
| commit | 681b73df5d28c5a5ffba4e2dc997d52e161b9c96 (patch) | |
| tree | 9b362c3da6dc4320729d7341e21320842d5add96 /sql/set_var.cc | |
| parent | 935c7fd15546972c078a3b1a22ef4e808ed5fd59 (diff) | |
| parent | b97d0ea2c3c2d325c56f01a8edf26e7944dea749 (diff) | |
| download | mariadb-git-681b73df5d28c5a5ffba4e2dc997d52e161b9c96.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
include/my_sys.h:
Auto merged
mysql-test/r/func_group.result:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 33dcd4b7e29..e70dd1c3b85 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1247,7 +1247,7 @@ bool sys_var_collation::check(THD *thd, set_var *var) if (!(tmp=get_charset_by_name(res->c_ptr(),MYF(0)))) { - my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), res->c_ptr()); + my_error(ER_UNKNOWN_COLLATION, MYF(0), res->c_ptr()); return 1; } var->save_result.charset= tmp; // Save for update |