bzr push into mysql-5.5-bugteam branch (magnus.blaudd:3136 to 3137)

[Magnus Blåudd]

 3137 Magnus Blåudd	2010-11-24 [merge]
      Merge

    modified:
      cmake/mysql_version.cmake
      cmake/plugin.cmake
      libmysqld/CMakeLists.txt
      sql/sql_priv.h
 3136 Alexander Nozdrin	2010-11-24 [merge]
      Merge from mysql-5.1-bugteam.

    modified:
      CMakeLists.txt
      libmysql/conf_to_src.c
      libmysql/errmsg.c
      libmysql/get_password.c
      libmysql/libmysql.c
      scripts/make_binary_distribution.sh
      scripts/make_win_bin_dist
      support-files/mysql.spec.sh
=== modified file 'cmake/mysql_version.cmake'
--- a/cmake/mysql_version.cmake	2010-11-20 22:56:09 +0000
+++ b/cmake/mysql_version.cmake	2010-11-24 10:37:59 +0000
@@ -21,17 +21,21 @@ SET(SHARED_LIB_MAJOR_VERSION "16")
 SET(PROTOCOL_VERSION "10")
 SET(DOT_FRM_VERSION "6")
 
+# Generate "something" to trigger cmake rerun when VERSION changes
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/VERSION
+  ${CMAKE_BINARY_DIR}/VERSION.dep
+)
+
 # Read value for a variable from VERSION.
 
 MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
  IF(NOT ${var})
-   IF (EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
-     FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
-    IF(str)
-      STRING(REPLACE "${keyword}=" "" str ${str})
-      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
-      SET(${var} ${str})
-    ENDIF()
+   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
+   IF(str)
+     STRING(REPLACE "${keyword}=" "" str ${str})
+     STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
+     SET(${var} ${str})
    ENDIF()
  ENDIF()
 ENDMACRO()

=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2010-11-12 12:42:50 +0000
+++ b/cmake/plugin.cmake	2010-11-24 10:49:10 +0000
@@ -123,7 +123,7 @@ MACRO(MYSQL_ADD_PLUGIN)
 
     # Update mysqld dependencies
     SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} 
-      ${target} CACHE INTERNAL "" FORCE)
+      ${target} ${ARG_LINK_LIBRARIES} CACHE INTERNAL "" FORCE)
 
     IF(ARG_MANDATORY)
       SET(${with_var} ON CACHE INTERNAL "Link ${plugin} statically to the server" 

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-09-20 14:17:32 +0000
+++ b/libmysqld/CMakeLists.txt	2010-11-16 09:05:54 +0000
@@ -26,7 +26,6 @@ ${CMAKE_SOURCE_DIR}/regex
 ${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${SSL_INTERNAL_INCLUDE_DIRS}
-${NDB_CLUSTER_INCLUDES}
 ${CMAKE_SOURCE_DIR}/sql/backup
 )
 
@@ -110,7 +109,7 @@ SET(LIBS 
   dbug strings regex mysys vio 
   ${ZLIB_LIBRARY} ${SSL_LIBRARIES} 
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
-  ${MYSQLD_STATIC_PLUGIN_LIBS} ${NDB_CLIENT_LIBS}
+  ${MYSQLD_STATIC_PLUGIN_LIBS}
   sql_embedded
 )
 

=== modified file 'sql/sql_priv.h'
--- a/sql/sql_priv.h	2010-10-07 08:24:44 +0000
+++ b/sql/sql_priv.h	2010-11-24 11:12:39 +0000
@@ -144,6 +144,12 @@
 */
 #define OPTION_MASTER_SQL_ERROR (1ULL << 35)
 
+/*
+  Dont report errors for individual rows,
+  But just report error on commit (or read ofcourse)
+  Note! Reserved for use in MySQL Cluster
+*/
+#define OPTION_ALLOW_BATCH              (ULL(1) << 36) // THD, intern (slave)
 
 /* The rest of the file is included in the server only */
 #ifndef MYSQL_CLIENT

No bundle (reason: useless for push emails).