From 137ae7907c6286b7ada59219268bd29d886543f8 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jan 2006 12:55:38 +0400 Subject: loaddata.result, loaddata.test: Adding test case. sql_yacc.yy: Adding TEXT_STRING_filesystem, which converts from character_set_client to character_set_conversion. Replacing TEXT_STRING_sys to TEXT_STRING_filesystem in LOAD DATA and SELECT INTO OUTFILE contexts. sql_class.h, sql_class.cc: Adding character_set_filesystem variable, and charset_is_character_set_filesystem flag (to avoid conversion when it's not necessary). set_var.h, set_var.cc: Adding sys_var_character_set_filesystem mysqld.cc: Adding --character-set-filesystem startup option. sql/mysqld.cc: Adding --character-set-filesystem startup option. sql/set_var.cc: Adding sys_var_character_set_filesystem sql/set_var.h: Adding sys_var_character_set_filesystem sql/sql_class.cc: Adding character_set_filesystem variable, and charset_is_character_set_filesystem flag (to avoid conversion when it's not necessary). sql/sql_class.h: Adding character_set_filesystem variable, and charset_is_character_set_filesystem flag (to avoid conversion when it's not necessary). sql/sql_yacc.yy: Adding TEXT_STRING_filesystem, which converts from character_set_client to character_set_conversion. Replacing TEXT_STRING_sys to TEXT_STRING_filesystem in LOAD DATA and SELECT INTO OUTFILE contexts. mysql-test/t/loaddata.test: Adding test case. mysql-test/r/loaddata.result: Adding test case. --- sql/set_var.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sql/set_var.h') diff --git a/sql/set_var.h b/sql/set_var.h index 2dde7f44a55..01705d5ff4d 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -549,6 +549,15 @@ public: virtual CHARSET_INFO **ci_ptr(THD *thd, enum_var_type type)= 0; }; +class sys_var_character_set_filesystem :public sys_var_character_set +{ +public: + sys_var_character_set_filesystem(const char *name_arg) : + 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); +}; + class sys_var_character_set_client :public sys_var_character_set { public: -- cgit v1.2.1