Commit 1260bc88 authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/home/antony/work2/wl3201.3 

into  xiphis.org:/home/antony/work2/wl3201.merge


BUILD/SETUP.sh:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
Makefile.am:
  Merge for WL#3201, some post-merge fixes will be required.
configure.in:
  Merge for WL#3201
plugin/Makefile.am:
  Merge for WL#3201
storage/innobase/Makefile.am:
  Merge for WL#3201
parents 3f63edb3 5521b1bb

BUILD/SETUP.sh

+3 −12
Original line number Diff line number Diff line
@@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" 
local_infile_configs="--enable-local-infile"





max_configs="--with-innodb --with-berkeley-db"

max_configs="$max_configs --with-archive-storage-engine"

max_configs="$max_configs --with-big-tables"

max_configs="$max_configs --with-blackhole-storage-engine"

max_configs="$max_configs --with-federated-storage-engine"

max_configs="$max_configs --with-csv-storage-engine"

max_configs="$max_configs --with-example-storage-engine"

max_configs="$max_configs --with-partition $SSL_LIBRARY"



max_no_embedded_configs="$max_configs --with-ndbcluster"

max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"

max_configs="$max_configs --with-ndbcluster --with-embedded-server"

max_no_embedded_configs="$SSL_LIBRARY --with-modules=max"

max_no_ndb_configs="$SSL_LIBRARY --with-modules=max-no-ndb --with-embedded-server"

max_configs="$SSL_LIBRARY --with-modules=max --with-embedded-server"



#

# CPU and platform specific compilation flags.

Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 
			@thread_dirs@ pstack \

			@sql_union_dirs@ storage \

			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			plugin unittest win

cmakelists.txt

+28 −25
Original line number Diff line number Diff line
@@ -9,56 +9,53 @@ SET(WITH_CSV_STORAGE_ENGINE TRUE) 
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in

               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)



SET(WITH_HEAP_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)

SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")



SET(WITH_MYISAM_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)

SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")



SET(WITH_MYISAMMRG_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)

SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")



IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &archive_hton")

  SET (mysql_se_decls "${mysql_se_decls}, archive_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_archive.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_archive_plugin")

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &blackhole_hton")

  SET (mysql_se_decls "${mysql_se_decls}, blackhole_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_blackhole.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_blackhole_plugin")

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

IF(WITH_CSV_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_CSV_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &tina_hton")

  SET (mysql_se_decls "${mysql_se_decls}, tina_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../storage/csv/ha_tina.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_csv_plugin")

ENDIF(WITH_CSV_STORAGE_ENGINE)

IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &example_hton")

  SET (mysql_se_decls "${mysql_se_decls}, example_hton")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_example_plugin")

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &innobase_hton")

  SET (mysql_se_decls "${mysql_se_decls}, innobase_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_innodb.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

IF(WITH_PARTITION_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &partition_hton")

  SET (mysql_se_decls "${mysql_se_decls}, partition_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_partition.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_partition_plugin")

ENDIF(WITH_PARTITION_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &federated_hton")

  SET (mysql_se_decls "${mysql_se_decls}, federated_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_federated.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &berkeley_hton")

  SET (mysql_se_decls "${mysql_se_decls}, berkeley_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_berkeley.cc")

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in 

               ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in 

               ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)



SET(localstatedir "C:\\mysql\\data")

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh
@@ -137,6 +134,12 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) 
IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/blackhole)

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

IF(WITH_CSV_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/csv)

ENDIF(WITH_CSV_STORAGE_ENGINE)

IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

config/ac-macros/ha_archive.m4

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_ARCHIVEDB

dnl Sets HAVE_ARCHIVE_DB if --with-archive-storage-engine is used

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_ARCHIVEDB], [

  AC_ARG_WITH([archive-storage-engine],

              [

  --with-archive-storage-engine

                          Enable the Archive Storage Engine],

              [archivedb="$withval"],

              [archivedb=no])

  AC_MSG_CHECKING([for archive storage engine])



  case "$archivedb" in

    yes )

      AC_DEFINE([HAVE_ARCHIVE_DB], [1], [Builds Archive Storage Engine])

      AC_MSG_RESULT([yes])

      [archivedb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [archivedb=no]

      ;;

  esac



])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_ARCHIVE SECTION

dnl ---------------------------------------------------------------------------

config/ac-macros/ha_berkeley.m4

+0 −3
Original line number Diff line number Diff line
@@ -120,12 +120,9 @@ AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [ 
       sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \

        AC_MSG_ERROR([could not configure Berkeley DB])

 

  mysql_se_libs="$mysql_se_libs $bdb_libs_with_path" 



  AC_SUBST(bdb_includes)

  AC_SUBST(bdb_libs)

  AC_SUBST(bdb_libs_with_path)

  AC_CONFIG_FILES(storage/bdb/Makefile)

])



AC_DEFUN([MYSQL_CHECK_INSTALLED_BDB], [