From: Date: November 12 2008 1:51pm
Subject: bzr commit into mysql-6.0-runtime branch (alik:2744)
List-Archive: http://lists.mysql.com/commits/58546
Message-Id: <20081112125159.A541E1D48F3@quad.opbmk>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///mnt/raid/alik/MySQL/bzr/6.0-rt/

 2744 Alexander Nozdrin	2008-11-12 [merge]
      Pull from 6.0
modified:
  mysys/my_init.c
  sql/sql_cache.cc

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2008-04-28 16:24:05 +0000
+++ b/mysys/my_init.c	2008-11-10 20:41:05 +0000
@@ -331,8 +331,6 @@ static void my_win_init(void)
   const char *targetKey = "Software\\MySQL" ;
   DBUG_ENTER("my_win_init");
 
-  setlocale(LC_CTYPE, "");             /* To get right sortorder */
-
 #if defined(_MSC_VER)
 #if _MSC_VER < 1300
   /* 

=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2008-11-07 14:01:59 +0000
+++ b/sql/sql_cache.cc	2008-11-11 16:47:57 +0000
@@ -902,12 +902,12 @@ Query_cache::Query_cache(ulong query_cac
   :query_cache_size(0),
    query_cache_limit(query_cache_limit_arg),
    queries_in_cache(0), hits(0), inserts(0), refused(0),
-   total_blocks(0), lowmem_prunes(0),
+   total_blocks(0), lowmem_prunes(0), m_query_cache_is_disabled(FALSE),
    min_allocation_unit(ALIGN_SIZE(min_allocation_unit_arg)),
    min_result_data_size(ALIGN_SIZE(min_result_data_size_arg)),
    def_query_hash_size(ALIGN_SIZE(def_query_hash_size_arg)),
    def_table_hash_size(ALIGN_SIZE(def_table_hash_size_arg)),
-   initialized(0), m_query_cache_is_disabled(FALSE)
+   initialized(0)
 {
   ulong min_needed= (ALIGN_SIZE(sizeof(Query_cache_block)) +
 		     ALIGN_SIZE(sizeof(Query_cache_block_table)) +