summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-09-15 16:31:04 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-09-15 16:31:04 +0500
commit322c10dd122f86f2eeafdf6507217eb1d1403c21 (patch)
tree0a3a1a25f4afbbef712e5f85b5de3d6ebbcebeb4 /sql/sql_class.h
parent4910cbf102423498f51440ec6ee33346f9f9e96b (diff)
downloadmariadb-git-322c10dd122f86f2eeafdf6507217eb1d1403c21.tar.gz
New SQL variables "collation_server" and "collation_database"
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index e8c09b326a5..e0358fc25e9 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -401,10 +401,13 @@ struct system_variables
my_bool new_mode;
my_bool old_passwords;
- CHARSET_INFO *character_set_server;
- CHARSET_INFO *character_set_database;
+ /* Only charset part of these variables is sensible */
CHARSET_INFO *character_set_client;
CHARSET_INFO *character_set_results;
+
+ /* Both charset and collation parts of these variables are important */
+ CHARSET_INFO *collation_server;
+ CHARSET_INFO *collation_database;
CHARSET_INFO *collation_connection;
};