database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

loaddata.result, loaddata.test:

Browse Source 
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.
This commit is contained in:
bar@mysql.com
2006-01-18 12:55:38 +04:00
parent 0e665a7aa5
commit 4e4b37a8ef
8 changed files with 125 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@@ -258,6 +258,7 @@ struct system_variables
my_bool old_passwords;
/* Only charset part of these variables is sensible */
CHARSET_INFO *character_set_filesystem;
CHARSET_INFO *character_set_client;
CHARSET_INFO *character_set_results;
@@ -1126,6 +1127,7 @@ public:
bool query_error, bootstrap, cleanup_done;
bool tmp_table_used;
bool charset_is_system_charset, charset_is_collation_connection;
bool charset_is_character_set_filesystem;
bool enable_slow_log; /* enable slow log for current statement */
bool no_trans_update, abort_on_warning;
bool got_warning; /* Set on call to push_warning() */