New SQL variables "collation_server" and "collation_database"

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;
 };