merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

4 files changed, 22 insertions, 11 deletions

diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 5aca3c825a6..5b18dd97756 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -54,7 +54,7 @@ MACRO(GET_MYSQL_VERSION)
   ENDIF()
 
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
-  MESSAGE("-- MySQL ${VERSION}")
+  MESSAGE("-- MariaDB ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
   STRING(REPLACE "-" "_" MYSQL_RPM_VERSION "${VERSION}")
@@ -92,15 +92,15 @@ IF(NOT CPACK_PACKAGE_FILE_NAME)
 ENDIF()
 
 IF(NOT CPACK_SOURCE_PACKAGE_FILE_NAME)
-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mysql-${VERSION}")
+  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-${VERSION}")
 ENDIF()
-SET(CPACK_PACKAGE_CONTACT "MySQL Build Team <build@mysql.com>")
-SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc")
+SET(CPACK_PACKAGE_CONTACT "MariaDB team <info@montyprogram.com>")
+SET(CPACK_PACKAGE_VENDOR "Monty Program AB")
 SET(CPACK_SOURCE_GENERATOR "TGZ")
 INCLUDE(cpack_source_ignore_files)
 
 # Defintions for windows version resources
-SET(PRODUCTNAME "MySQL Server")
+SET(PRODUCTNAME "MariaDB Server")
 SET(COMPANYNAME ${CPACK_PACKAGE_VENDOR})
 
 # Windows 'date' command has unpredictable output, so cannot rely on it to
@@ -117,6 +117,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)
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index b51f3a2dc52..6a8c027daf8 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -88,7 +88,7 @@ IF(MSVC)
   # Fix CMake's predefined huge stack size
   FOREACH(type EXE SHARED MODULE)
    STRING(REGEX REPLACE "/STACK:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS "${CMAKE_${type}_LINKER_FLAGS}")
-   STRING(REGEX REPLACE "/INCREMENTAL:([^ ]+)" "" CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO}")
+   STRING(REGEX REPLACE "/INCREMENTAL:([^ ]+)" "/INCREMENTAL:NO" CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO}")
   ENDFOREACH()
   
   # Mark 32 bit executables large address aware so they can 
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index b027ac3901f..7d6e4d7348a 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -88,6 +88,13 @@ IF(NOT VERSION)
         SET(DEFAULT_MACHINE "universal")
       ELSE()
         SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        IF(NOT DEFAULT_MACHINE)
+          IF(CMAKE_SIZEOF_VOIPD EQUAL 4)
+            SET(DEFAULT_MACHINE  "i386")
+          ELSE()
+            SET(DEFAULT_MACHINE  "x86_64")
+          ENDIF()
+        ENDIF()
       ENDIF()
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
@@ -116,7 +123,7 @@ IF(NOT VERSION)
     SET(PRODUCT_TAG)
   ENDIF()
 
-  SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
+  SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
   
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)
diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in
index c625ce8c7f4..fc3e72f33ac 100644
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
@@ -1,7 +1,7 @@
 #include <windows.h>

 VS_VERSION_INFO VERSIONINFO

-FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,0

-PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,0

+FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@

+PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@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_VERSION@.0\0"

-            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.0\0"

+            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"

+            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"

         END

     END

     BLOCK "VarFileInfo"