Some optimization in CHARSET_INFO:

  We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 3a66e906837..0b8e6a192b4 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -142,7 +142,7 @@ THD::THD():user_time(0), is_fatal_error(0),
   bzero((char*) &warn_root,sizeof(warn_root));
   init_alloc_root(&warn_root, 1024, 0);
   user_connect=(USER_CONN *)0;
-  hash_init(&user_vars, system_charset_info, USER_VARS_HASH_SIZE, 0, 0,
+  hash_init(&user_vars, &my_charset_bin, USER_VARS_HASH_SIZE, 0, 0,
 	    (hash_get_key) get_var_key,
 	    (hash_free_key) free_user_var,0);
 
@@ -246,7 +246,7 @@ void THD::change_user(void)
   cleanup();
   cleanup_done= 0;
   init();
-  hash_init(&user_vars, system_charset_info, USER_VARS_HASH_SIZE, 0, 0,
+  hash_init(&user_vars, &my_charset_bin, USER_VARS_HASH_SIZE, 0, 0,
 	    (hash_get_key) get_var_key,
 	    (hash_free_key) free_user_var, 0);
 }