merge

mysql-test/r/myisam.result

@@ -2445,3 +2445,9 @@ DROP TABLE t1;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 SET myisam_repair_threads=@@global.myisam_repair_threads;
 End of 5.1 tests
+show variables like 'myisam_block_size';
+Variable_name	Value
+myisam_block_size	1024
+select @@global.myisam_block_size;
+@@global.myisam_block_size
+1024

mysql-test/t/myisam.test

@@ -1693,3 +1693,6 @@ SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 SET myisam_repair_threads=@@global.myisam_repair_threads;
 
 --echo End of 5.1 tests
+
+show variables like 'myisam_block_size';
+select @@global.myisam_block_size;

sql-common/client_plugin.c

@@ -27,6 +27,11 @@
   There is no reference counting and no unloading either.
 */
 
+#if _MSC_VER
+/* Silence warnings about variable 'unused' being used. */
+#define FORCE_INIT_OF_VARS 1
+#endif
+
 #include <my_global.h>
 #include "mysql.h"
 #include <my_sys.h>

sql/set_var.cc

@@ -472,6 +472,10 @@ static sys_var_thd_enum         sys_myisam_stats_method(&vars, "myisam_stats_met
                                                 &myisam_stats_method_typelib,
                                                 NULL);
 
+static sys_var_const            sys_myisam_block_size(&vars, "myisam_block_size",
+                                             OPT_GLOBAL, SHOW_LONG,
+                                             (uchar*) &myisam_block_size);
+
 #ifdef __NT__
 /* purecov: begin inspected */
 static sys_var_const            sys_named_pipe(&vars, "named_pipe",

win/cmake/mysql_version.cmake

@@ -116,6 +116,10 @@ ENDIF()
 # Refer to http://msdn.microsoft.com/en-us/library/aa381058(VS.85).aspx
 # for more info.
 IF(MSVC)
+    # Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number>
+    # to bzr revno for example (in the CI builds)
+    SET(TINY_VERSION "0" CACHE INTERNAL "")
+  
     GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 	
     SET(FILETYPE VFT_APP)

win/cmake/versioninfo.rc.in

@@ -1,7 +1,7 @@
 #include <windows.h>
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,0
-PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,0
+FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,@TINY_VERSION@
+PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,@TINY_VERSION@
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 FILEFLAGS       0
 FILEOS          VOS__WINDOWS32
@@ -12,8 +12,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.0\0"
-            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.0\0"
+            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.@TINY_VERSION@\0"
+            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.@TINY_VERSION@\0"
         END
     END
     BLOCK "VarFileInfo"