diff options
| author | unknown <bar@mysql.com> | 2006-02-14 08:24:01 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-02-14 08:24:01 +0400 |
| commit | 7ce3b2a3811b993412783a31bcb7bac186eab928 (patch) | |
| tree | e1d340fa56782a632d84e8b26268378a80e0343b /sql/sql_class.h | |
| parent | 4e8f2a12bc0145224af14138aee964902b88648e (diff) | |
| download | mariadb-git-7ce3b2a3811b993412783a31bcb7bac186eab928.tar.gz | |
Many files:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/mysqld.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.h:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.cc:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.h:
Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_yacc.yy:
Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/t/variables.test:
Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/r/variables.result:
Backporting character_set_filesystem from 5.0 to 5.1.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c025b4f0774..1672a5ea811 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -569,6 +569,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; @@ -1341,6 +1342,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() */ |