Merge 7.3 -> trunk-cluster

Author: magnus.blaudd@oracle.com

mysql-test/include/have_ndb_debug.inc

@@ -0,0 +1,10 @@
+# Check that ndb is compiled for debugging
+# to all for using debugging commands in ndb_mgm
+disable_query_log;
+--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" --verbose=0 -e "help" > $MYSQLTEST_VARDIR/tmp/help_debug.txt
+create table help_debug(help varchar(256));
+-- eval load data local infile '$MYSQLTEST_VARDIR/tmp/help_debug.txt' into table help_debug;
+-- require r/have_ndb_debug.require
+select count(*) as have_ndb_debug from help_debug where help like "%debug compiled%";
+-- eval drop table help_debug;
+enable_query_log;

mysql-test/r/have_ndb_debug.require

@@ -0,0 +1,2 @@
+have_ndb_debug
+1

mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result

@@ -6645,8 +6645,8 @@ FROM t1
 LEFT OUTER JOIN t2 ON t2.id = t1.t2_id
 LEFT OUTER JOIN t2 as t3 ON t3.id = t1.t2_id;
 id	t2_id	id	t3_id	id	t3_id
-23	24	24	NULL	24	NULL
 20	NULL	NULL	NULL	NULL	NULL
+23	24	24	NULL	24	NULL
 DROP TABLE t1,t2,t3,t4;
 CREATE TABLE t1 (
 a int NOT NULL,

mysql-test/suite/ndb/t/ndb_bug14166590.test

@@ -5,7 +5,7 @@
 -- source include/not_embedded.inc
 -- source include/have_ndb.inc
 # We are using some debug-only features in this test
---source include/have_debug.inc
+--source include/have_ndb_debug.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/suite/ndb/t/ndb_join_pushdown.inc

@@ -4062,6 +4062,7 @@ SELECT *
   FROM t1
        LEFT OUTER JOIN t2 ON t2.id = t1.t2_id
        LEFT OUTER JOIN t2 as t3 ON t3.id = t1.t2_id;
+--sorted_result
 SELECT *
   FROM t1
        LEFT OUTER JOIN t2 ON t2.id = t1.t2_id

mysql-test/suite/ndb_big/rqg_spj.test

@@ -47,7 +47,7 @@ let $cmd = $RUN_RQG -g spj_test.yy -t 600;
 --exec bash -c "$cmd"
 --exec bash -c "$cmd"
 
-drop database spj_myisam;
+drop database spj_innodb;
 drop database spj_ndb;
 
 --disable_query_log

mysql-test/suite/ndb_binlog/t/ndb_binlog_discover_multi.test

@@ -88,7 +88,8 @@ select * from t1;
 
 FLUSH BINARY LOGS;
 let $MYSQLD_DATADIR= `select @@datadir;`;
---exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/mysqld-bin.000003 | grep "@2='String to find'"
+--replace_regex /(.*)/REMOVE_LINE:\1/ /REMOVE_LINE:(.*@2='String to find')/KEEP_LINE:\1/ /REMOVE_LINE:.*// /KEEP_LINE://
+--exec $MYSQL_BINLOG --verbose $MYSQLD_DATADIR/mysqld-bin.000003
 
 #
 # Cleanup

storage/ndb/CMakeLists.txt

@@ -64,9 +64,10 @@ ENDIF()
 IF(CMAKE_COMPILER_IS_GNUCXX)
   INCLUDE(CheckCXXCompilerFlag)
   FOREACH(warning "unused-but-set-variable" "strict-aliasing")
-    UNSET(flag_supported CACHE)
-    CHECK_CXX_COMPILER_FLAG("-Wno-${warning}" flag_supported)
-    IF(flag_supported)
+    STRING(REPLACE "-" "_" warning_ ${warning})
+    STRING(TOUPPER ${warning_} WARNING)
+    CHECK_CXX_COMPILER_FLAG("-Wno-${warning}" HAVE_${WARNING})
+    IF(HAVE_${WARNING})
       MESSAGE(STATUS "Disabling -W${warning} warning")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-${warning}")
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-${warning}")

storage/ndb/clusterj/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
@@ -57,3 +57,49 @@ CREATE_JAR(clusterj
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)
+
+# create maven pom.xml in all subdirectories
+SET(CLUSTERJ_PROJECTS api core jdbc jpatest openjpa test tie unit)
+
+IF(WIN32)
+
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/pom.xml.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
+    @ONLY NEWLINE_STYLE WIN32)
+
+  FOREACH(CLUSTERJ_PROJECT ${CLUSTERJ_PROJECTS}) 
+    # build all the pom.xml for windows
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/clusterj-${CLUSTERJ_PROJECT}/pom.xml.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/clusterj-${CLUSTERJ_PROJECT}/pom.xml
+                 @ONLY NEWLINE_STYLE WIN32)
+  ENDFOREACH(CLUSTERJ_PROJECT in CLUSTERJ_PROJECTS)
+
+  # build the mvn_install_ndbjtie for windows
+  #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mvn_install_ndbjtie.cmd.in
+  #               ${CMAKE_CURRENT_SOURCE_DIR}/mvn_install_ndbjtie.cmd
+  #               @ONLY NEWLINE_STYLE WIN32)
+
+ELSE(WIN32)
+
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/pom.xml.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
+    @ONLY NEWLINE_STYLE UNIX)
+
+  FOREACH(CLUSTERJ_PROJECT ${CLUSTERJ_PROJECTS}) 
+    # build the pom.xml for *nix
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/clusterj-${CLUSTERJ_PROJECT}/pom.xml.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/clusterj-${CLUSTERJ_PROJECT}/pom.xml
+                 @ONLY NEWLINE_STYLE UNIX)
+  ENDFOREACH(CLUSTERJ_PROJECT in CLUSTERJ_PROJECTS)
+
+  # build the mvn_install_ndbjtie for *nix
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mvn_install_ndbjtie.sh.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/mvn_install_ndbjtie.sh
+                 @ONLY NEWLINE_STYLE UNIX)
+
+  ADD_CUSTOM_TARGET(mvn_install_ndbjtie ALL
+    chmod a+x "${CMAKE_CURRENT_SOURCE_DIR}/mvn_install_ndbjtie.sh"
+    || echo "") # don't break the build if file was deleted)
+
+ENDIF(WIN32)
+

storage/ndb/clusterj/clusterj-api/pom.xml renamed to storage/ndb/clusterj/clusterj-api/pom.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 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
@@ -20,13 +20,13 @@
   <parent>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-aggregate</artifactId>
-    <version>7.1.22-SNAPSHOT</version>
+    <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-api</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.22-SNAPSHOT</version>
+  <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   <name>ClusterJ API</name>
   <description>The API for ClusterJ</description>
   <build>

storage/ndb/clusterj/clusterj-bindings/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 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
@@ -20,13 +20,13 @@
   <parent>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-aggregate</artifactId>
-    <version>7.1.22-SNAPSHOT</version>
+    <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-core</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.22-SNAPSHOT</version>
+  <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   <name>ClusterJ Core</name>
   <description>The core implementation of ClusterJ</description>
   <build>

storage/ndb/clusterj/clusterj-core/pom.xml renamed to storage/ndb/clusterj/clusterj-core/pom.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 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
@@ -19,13 +19,13 @@
   <parent>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-aggregate</artifactId>
-    <version>7.1.22-SNAPSHOT</version>
+    <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>clusterj</groupId>
   <artifactId>clusterj-jdbc</artifactId>
   <name>ClusterJ JDBC Plugin</name>
-  <version>7.1.22-SNAPSHOT</version>
+  <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   <dependencies>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>

storage/ndb/clusterj/clusterj-jdbc/pom.xml renamed to storage/ndb/clusterj/clusterj-jdbc/pom.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 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
@@ -28,12 +28,12 @@
   <parent>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-aggregate</artifactId>
-    <version>7.1.22-SNAPSHOT</version>
+    <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
   </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-jpatest</artifactId>
-    <version>7.1.22-SNAPSHOT</version>
+    <version>@JAVA_NDB_VERSION@@JAVA_MVN_SUFFIX@</version>
     <packaging>jar</packaging>
     <name>ClusterJ JPA Integration Tests</name>