[Commits] Rev 3166: Merge MySQL 5.1.66 -> MariaDB 5.1.65 in file:///home/tsk/mprog/src/5.1-merge/

timour at askmonty.org timour at askmonty.org
Fri Nov 2 15:12:28 EET 2012


At file:///home/tsk/mprog/src/5.1-merge/

------------------------------------------------------------
revno: 3166 [merge]
revision-id: timour at askmonty.org-20121102131207-z4ztyhb3uii105wq
parent: timour at askmonty.org-20121102123525-kq5kpo3kfhaivbxw
parent: bjorn.munch at oracle.com-20120719105736-81u24ks21ax3lgkg
committer: timour at askmonty.org
branch nick: 5.1-merge
timestamp: Fri 2012-11-02 15:12:07 +0200
message:
  Merge MySQL 5.1.66 -> MariaDB 5.1.65
     
  (step 3)
modified:
  CMakeLists.txt                 sp1f-cmakelists.txt-20060831175236-433hkm7nrqfjbwios4ancgytabw354nr
  Makefile.am                    sp1f-makefile.am-19700101030959-jbbpiygwpgybyqknlavdxxupbrjonu7h
  configure.in                   sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
-------------- next part --------------
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-11-21 17:13:14 +0000
+++ b/CMakeLists.txt	2012-11-02 13:12:07 +0000
@@ -436,6 +436,9 @@ IF(WITH_EMBEDDED_SERVER)
   ADD_SUBDIRECTORY(libmysqld/examples)
 ENDIF(WITH_EMBEDDED_SERVER)
 ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+  ADD_SUBDIRECTORY(internal)
+ENDIF()
 
 # Set up the installer
 SET(CPACK_PACKAGE_NAME "MariaDB")

=== modified file 'Makefile.am'
--- a/Makefile.am	2011-05-02 17:58:45 +0000
+++ b/Makefile.am	2012-11-02 13:12:07 +0000
@@ -26,7 +26,7 @@ EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN
 SUBDIRS =               . include @docs_dirs@ @zlib_dir@ \
                         @readline_topdir@ sql-common scripts \
                         @sql_union_dirs@ unittest \
-                        @sql_server@ @man_dirs@ tests \
+                        @sql_server@ @man_dirs@ tests internal \
                         netware @libmysqld_dirs@ \
                         mysql-test support-files sql-bench @tools_dirs@ \
                         win

=== modified file 'configure.in'
--- a/configure.in	2012-11-02 08:03:20 +0000
+++ b/configure.in	2012-11-02 13:12:07 +0000
@@ -2945,6 +2945,10 @@ if test -d "$srcdir/cmd-line-utils/readl
   AC_CONFIG_FILES(cmd-line-utils/readline/Makefile)
 fi
 
+if test -d "$srcdir/internal" ; then
+  AC_CONFIG_FILES(internal/Makefile)
+fi
+
 AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
  unittest/mysys/Makefile unittest/strings/Makefile dnl



More information about the commits mailing list