From e8adc3f74be7c8c8e81e59b1f5927bedf4a561bb Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Oct 2007 14:28:00 +0500 Subject: Fix for bug#31615: crash after set names ucs2 collate xxx Problem: currently, UCS-2 cannot be used as a client character set. Fix: raise an error if one attempts to set it to USC-2. mysql-test/r/ctype_ucs.result: Fix for bug#31615: crash after set names ucs2 collate xxx - test result. mysql-test/t/ctype_ucs.test: Fix for bug#31615: crash after set names ucs2 collate xxx - test case. sql/set_var.cc: Fix for bug#31615: crash after set names ucs2 collate xxx - raise an error if one is going to set character_set_client to UCS-2. sql/set_var.h: Fix for bug#31615: crash after set names ucs2 collate xxx - raise an error if one is going to set character_set_client to UCS-2. --- sql/set_var.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/set_var.h') diff --git a/sql/set_var.h b/sql/set_var.h index 78b34963e9d..f6fd0a082b5 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -578,6 +578,7 @@ public: sys_var_character_set(name_arg) {} void set_default(THD *thd, enum_var_type type); CHARSET_INFO **ci_ptr(THD *thd, enum_var_type type); + bool check(THD *thd, set_var *var); }; class sys_var_character_set_results :public sys_var_character_set -- cgit v1.2.1