merge 5.5 => 5.6

Author: Tor Didriksen

cmake/dtrace.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -157,7 +157,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND ENABLE_DTRACE)
   FOREACH(lib ${libs})
     GET_TARGET_PROPERTY(libtype ${lib} TYPE)
     IF(libtype MATCHES STATIC_LIBRARY)
-      SET(static_libs ${static_lics} ${lib})
+      SET(static_libs ${static_libs} ${lib})
     ENDIF()
   ENDFOREACH()
 

sql/sys_vars.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -128,7 +128,11 @@ class Sys_var_integer: public sys_var
     option.u_max_value= (uchar**)max_var_ptr();
     if (max_var_ptr())
       *max_var_ptr()= max_val;
-    global_var(T)= def_val;
+
+    // Do not set global_var for Sys_var_keycache objects
+    if (offset >= 0)
+      global_var(T)= def_val;
+
     DBUG_ASSERT(size == sizeof(T));
     DBUG_ASSERT(min_val < max_val);
     DBUG_ASSERT(min_val <= def_val);
@@ -726,12 +730,15 @@ class Sys_var_keycache: public Sys_var_ulonglong
           on_check_function on_check_func,
           keycache_update_function on_update_func,
           const char *substitute=0)
-    : Sys_var_ulonglong(name_arg, comment, flag_args, off, size,
-              getopt, min_val, max_val, def_val,
-              block_size, lock, binlog_status_arg, on_check_func, 0,
-              substitute),
+    : Sys_var_ulonglong(name_arg, comment, flag_args,
+                        -1,     /* offset, see base class CTOR */
+                        size,
+                        getopt, min_val, max_val, def_val,
+                        block_size, lock, binlog_status_arg, on_check_func, 0,
+                        substitute),
     keycache_update(on_update_func)
   {
+    offset= off; /* Remember offset in KEY_CACHE */
     option.var_type|= GET_ASK_ADDR;
     option.value= (uchar**)1; // crash me, please
     keycache_var(dflt_key_cache, off)= def_val;