From: Ole John Aske Date: November 16 2010 1:34pm Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3371 to 3372) List-Archive: http://lists.mysql.com/commits/124040 Message-Id: <20101116133424.E1C22222@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3372 Ole John Aske 2010-11-16 [merge] Merge from telco-70 main modified: client/mysqltest.cc cmake/build_configurations/mysql_release.cmake cmake/cmake_parse_arguments.cmake cmake/install_layout.cmake cmake/install_macros.cmake cmake/libutils.cmake cmake/mysql_add_executable.cmake cmake/os/WindowsCache.cmake cmake/plugin.cmake mysql-test/mysql-test-run.pl storage/ndb/include/ndb_global.h storage/ndb/tools/CMakeLists.txt 3371 Ole John Aske 2010-11-16 SPJ-scan-scan: Extended RQG grammar to also allow 'IS (not) NULL', general comparison predicates, IN predicates, and AND/OR combinations in join conditions. modified: storage/ndb/test/rqg/spj_test.yy === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2010-11-15 10:05:01 +0000 +++ b/client/mysqltest.cc 2010-11-15 13:21:12 +0000 @@ -8331,10 +8331,11 @@ int main(int argc, char **argv) do_sync_with_master2(command, 0); break; } -#ifdef MCP_RESULT_FORMAT_VERSION case Q_COMMENT: /* Ignore row */ +#ifdef MCP_RESULT_FORMAT_VERSION command->last_argument= command->end; #else + /* Don't ignore comment row */ { const char* p= command->query; command->last_argument= command->end; === modified file 'cmake/build_configurations/mysql_release.cmake' --- a/cmake/build_configurations/mysql_release.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/build_configurations/mysql_release.cmake 2010-11-15 16:07:44 +0000 @@ -131,16 +131,16 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer") + SET(COMMON_C_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing") SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer") + SET(COMMON_CXX_FLAGS "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing") SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") ENDIF() - + # HPUX flags IF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") IF(CMAKE_C_COMPILER_ID MATCHES "HP") @@ -156,7 +156,7 @@ IF(UNIX) ENDIF() SET(WITH_SSL no) ENDIF() - + # Linux flags IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(CMAKE_C_COMPILER_ID MATCHES "Intel") @@ -173,18 +173,18 @@ IF(UNIX) SET(WITH_SSL no) ENDIF() ENDIF() - + # OSX flags IF(APPLE) - SET(COMMON_C_FLAGS "-g -fno-common") + SET(COMMON_C_FLAGS "-g -fno-common -fno-strict-aliasing") # XXX: why are we using -felide-constructors on OSX? - SET(COMMON_CXX_FLAGS "-g -fno-common -felide-constructors") + SET(COMMON_CXX_FLAGS "-g -fno-common -felide-constructors -fno-strict-aliasing") SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}") SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os ${COMMON_C_FLAGS}") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}") ENDIF() - + # Solaris flags IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") IF(CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9") @@ -219,7 +219,7 @@ IF(UNIX) ENDIF() ENDIF() ENDIF() - + IF(CMAKE_C_FLAGS_DEBUG) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" CACHE STRING "Debug C compile flags") === modified file 'cmake/cmake_parse_arguments.cmake' --- a/cmake/cmake_parse_arguments.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/cmake_parse_arguments.cmake 2010-11-15 16:07:44 +0000 @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Handy macro to parse macro arguments -MACRO(CMAKE_PARSE_ARGUMENTS prefix arg_names option_names) +MACRO(MYSQL_PARSE_ARGUMENTS prefix arg_names option_names) SET(DEFAULT_ARGS) FOREACH(arg_name ${arg_names}) SET(${prefix}_${arg_name}) === modified file 'cmake/install_layout.cmake' --- a/cmake/install_layout.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/install_layout.cmake 2010-11-15 16:07:44 +0000 @@ -59,13 +59,16 @@ # - INSTALL_SUPPORTFILESDIR (various extra support files) # # - INSTALL_MYSQLDATADIR (data directory) +# +# When changing this page, _please_ do not forget to update public Wiki +# http://forge.mysql.com/wiki/CMake#Fine-tuning_installation_paths IF(NOT INSTALL_LAYOUT) SET(DEFAULT_INSTALL_LAYOUT "STANDALONE") ENDIF() SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}" -CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) or UNIX") +CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4") IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") @@ -83,6 +86,13 @@ IF(UNIX) SET(CMAKE_INSTALL_PREFIX ${default_prefix} CACHE PATH "install prefix" FORCE) ENDIF() + SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4") + LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind) + IF(ind EQUAL -1) + MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}." + " Choose between ${VALID_INSTALL_LAYOUTS}" ) + ENDIF() + SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "config directory (for my.cnf)") MARK_AS_ADVANCED(SYSCONFDIR) === modified file 'cmake/install_macros.cmake' --- a/cmake/install_macros.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/install_macros.cmake 2010-11-15 16:07:44 +0000 @@ -83,7 +83,7 @@ FUNCTION(INSTALL_MANPAGE file) ENDFUNCTION() FUNCTION(INSTALL_SCRIPT) - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "DESTINATION;COMPONENT" "" ${ARGN} @@ -205,7 +205,7 @@ ENDMACRO() # FUNCTION(MYSQL_INSTALL_TARGETS) - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "DESTINATION;COMPONENT" "" ${ARGN} @@ -249,7 +249,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/d FUNCTION(INSTALL_DEBUG_TARGET target) - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT" "" ${ARGN} === modified file 'cmake/libutils.cmake' --- a/cmake/libutils.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/libutils.cmake 2010-11-15 16:07:44 +0000 @@ -213,7 +213,7 @@ ENDMACRO() # [OUTPUT_NAME output_name] #) MACRO(MERGE_LIBRARIES) - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "EXPORTS;OUTPUT_NAME;COMPONENT" "STATIC;SHARED;MODULE;NOINSTALL" ${ARGN} === modified file 'cmake/mysql_add_executable.cmake' --- a/cmake/mysql_add_executable.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/mysql_add_executable.cmake 2010-11-15 16:07:44 +0000 @@ -28,7 +28,7 @@ INCLUDE(cmake_parse_arguments) FUNCTION (MYSQL_ADD_EXECUTABLE) # Pass-through arguments for ADD_EXECUTABLE - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT" "" ${ARGN} === modified file 'cmake/os/WindowsCache.cmake' --- a/cmake/os/WindowsCache.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/os/WindowsCache.cmake 2010-11-15 16:07:44 +0000 @@ -131,6 +131,7 @@ SET(HAVE_PASE_ENVIRONMENT CACHE INTERNA SET(HAVE_PATHS_H CACHE INTERNAL "") SET(HAVE_PCLOSE CACHE INTERNAL "") SET(HAVE_PERROR 1 CACHE INTERNAL "") +SET(HAVE_PEERCRED CACHE INTERNAL "") SET(HAVE_POLL_H CACHE INTERNAL "") SET(HAVE_POPEN CACHE INTERNAL "") SET(HAVE_POLL CACHE INTERNAL "") === modified file 'cmake/plugin.cmake' --- a/cmake/plugin.cmake 2010-11-09 14:33:15 +0000 +++ b/cmake/plugin.cmake 2010-11-15 16:07:44 +0000 @@ -28,7 +28,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_ # [DEPENDENCIES target1...targetN] MACRO(MYSQL_ADD_PLUGIN) - CMAKE_PARSE_ARGUMENTS(ARG + MYSQL_PARSE_ARGUMENTS(ARG "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME" "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED" ${ARGN} === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-10-25 15:16:18 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-11-15 14:03:22 +0000 @@ -294,15 +294,12 @@ sub main { # Check for any extra suites to enable based on the path name my %extra_suites= ( - "bzr_mysql-5.1-ndb" => "ndb_team", - "bzr_mysql-5.1-ndb-merge" => "ndb_team", - "bzr_mysql-5.1-telco-6.2" => "ndb_team", - "bzr_mysql-5.1-telco-6.2-merge" => "ndb_team", - "bzr_mysql-5.1-telco-6.3" => "ndb_team", - "bzr_mysql-5.1-telco-6.4" => "ndb_team", - "bzr_mysql-5.1-telco-7.0" => "ndb_team", - "bzr_mysql-5.1-telco-7.1" => "ndb_team", - "bzr_mysql-6.0-ndb" => "ndb_team,rpl_ndb_big,ndb_binlog", + "mysql-5.1-new-ndb" => "ndb_team", + "mysql-5.1-new-ndb-merge" => "ndb_team", + "mysql-5.1-telco-6.2" => "ndb_team", + "mysql-5.1-telco-6.2-merge" => "ndb_team", + "mysql-5.1-telco-6.3" => "ndb_team", + "mysql-6.0-ndb" => "ndb_team", ); foreach my $dir ( reverse splitdir($basedir) ) { === modified file 'storage/ndb/include/ndb_global.h' --- a/storage/ndb/include/ndb_global.h 2010-11-11 13:19:26 +0000 +++ b/storage/ndb/include/ndb_global.h 2010-11-15 15:03:18 +0000 @@ -46,7 +46,6 @@ #define NDB_WIN 1 #define PATH_MAX 256 #define DIR_SEPARATOR "\\" -#define HAVE_STRCASECMP #pragma warning(disable: 4503 4786) #else #undef NDB_WIN32 @@ -107,11 +106,6 @@ extern char * strdup(const char *s); #endif -#ifndef HAVE_STRCASECMP -extern int strcasecmp(const char *s1, const char *s2); -extern int strncasecmp(const char *s1, const char *s2, size_t n); -#endif - static const char table_name_separator = '/'; #if defined(_AIX) || defined(WIN32) || defined(NDB_VC98) === modified file 'storage/ndb/tools/CMakeLists.txt' --- a/storage/ndb/tools/CMakeLists.txt 2010-11-15 10:32:58 +0000 +++ b/storage/ndb/tools/CMakeLists.txt 2010-11-15 14:18:10 +0000 @@ -61,7 +61,7 @@ ADD_CUSTOM_TARGET(ndbinfo_sql_run ALL DEPENDS ${PROJECT_SOURCE_DIR}/storage/ndb/tools/ndbinfo.sql) -IF (MYSQL_VERSION_ID VERSION_LESS "50501") +IF (MYSQL_VERSION_ID LESS "50501") # Don't build or install this program anymore in 5.5+ ADD_EXECUTABLE(ndb_test_platform ndb_test_platform.cpp) ENDIF() No bundle (reason: useless for push emails).