Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

1 files changed, 4 insertions, 10 deletions

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 7ea50a62239..ecfbcc7cd83 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -786,11 +786,8 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
        most significant bit - CLIENT_LONG_FLAG,
        other - charset number (0 no charset convertion)
     */
-    if (thd->variables.convert_set != 0)
-    {
-      flags|= (byte) thd->variables.convert_set->number();
-      DBUG_ASSERT(thd->variables.convert_set->number() < 128);
-    }
+    flags|= (byte) thd->charset()->number;
+    DBUG_ASSERT(thd->charset()->number < 128);
     tot_length=thd->query_length+thd->db_length+2;
     thd->query[tot_length-1] = (char) flags;
 
@@ -943,11 +940,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
      Other - charset number (0 no charset convertion)
   */
   flags = (thd->client_capabilities & CLIENT_LONG_FLAG ? 0x80 : 0);
-  if (thd->variables.convert_set != 0)
-  {
-    flags |= (byte) thd->variables.convert_set->number();
-    DBUG_ASSERT(thd->variables.convert_set->number() < 128);
-  }
+  flags |= (byte) thd->charset()->number;
+  DBUG_ASSERT(thd->charset()->number < 128);
   sql[tot_length-1] = (char) flags;
   query_block = (Query_cache_block *)  hash_search(&queries, (byte*) sql,
 						   tot_length);