MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:September 21 2009 7:05pm
Subject:bzr push into mysql-6.0 branch (jperkin:3604)
View as plain text  
 3604 Jonathan Perkin	2009-09-21 [merge]
      merge

=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-09-16 06:09:09 +0000
+++ b/CMakeLists.txt	2009-09-21 18:33:08 +0000
@@ -171,6 +171,7 @@ ENDIF(MSVC)
 
 IF(WIN32)
   ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
+  ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501")
 ENDIF(WIN32)
 
 # default to x86 platform.  We'll check for X64 in a bit

=== modified file 'cmd-line-utils/readline/util.c'
--- a/cmd-line-utils/readline/util.c	2009-06-29 13:17:01 +0000
+++ b/cmd-line-utils/readline/util.c	2009-08-14 15:18:52 +0000
@@ -81,8 +81,13 @@ rl_alphabetic (c)
 
 #if defined (HANDLE_MULTIBYTE)
 int
-_rl_walphabetic (wc)
-     wchar_t wc;
+/*
+  Portability issue with VisualAge C++ Professional / C for AIX Compiler, Version 6:
+    "util.c", line 84.1: 1506-343 (S) Redeclaration of _rl_walphabetic differs
+    from previous declaration on line 110 of "rlmbutil.h".
+  So, put type in the function signature here.
+*/
+_rl_walphabetic (wchar_t wc)
 {
   int c;
 

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-08-18 11:04:32 +0000
+++ b/mysql-test/Makefile.am	2009-09-21 18:33:08 +0000
@@ -17,7 +17,8 @@
 
 ## Process this file with automake to create Makefile.in
 
-testdir =	$(prefix)/mysql-test
+testroot =	$(prefix)
+testdir =	$(testroot)/mysql-test
 
 test_SCRIPTS =	mtr \
 		mysql-test-run \

=== modified file 'mysql-test/lib/My/SafeProcess/Makefile.am'
--- a/mysql-test/lib/My/SafeProcess/Makefile.am	2009-03-16 17:00:38 +0000
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am	2009-09-21 18:33:08 +0000
@@ -13,7 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-safedir = $(prefix)/mysql-test/lib/My/SafeProcess
+testroot = $(prefix)
+safedir = $(testroot)/mysql-test/lib/My/SafeProcess
 #nobase_bin_PROGRAMS = ...
 safe_PROGRAMS =		my_safe_process
 

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2009-07-02 14:23:36 +0000
+++ b/scripts/make_win_bin_dist	2009-09-21 18:59:57 +0000
@@ -276,6 +276,8 @@ cp include/mysql/plugin.h $DESTDIR/inclu
 # ----------------------------------------------------------------------
 
 mkdir -p $DESTDIR/lib/opt
+mkdir -p $DESTDIR/lib/plugin
+cp sql/$TARGET/mysqld.lib $DESTDIR/lib/
 cp libmysql/$TARGET/libmysql.dll \
    libmysql/$TARGET/libmysql.lib \
    libmysql/$TARGET/mysqlclient.lib \
@@ -283,6 +285,10 @@ cp libmysql/$TARGET/libmysql.dll \
    regex/$TARGET/regex.lib \
    strings/$TARGET/strings.lib \
    zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
+if [ -d storage/innodb_plugin ]; then
+  cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.dll \
+     $DESTDIR/lib/plugin/
+fi
 
 if [ x"$TARGET" != x"release" ] ; then
   cp libmysql/$TARGET/libmysql.pdb \
@@ -291,11 +297,17 @@ if [ x"$TARGET" != x"release" ] ; then
      regex/$TARGET/regex.pdb \
      strings/$TARGET/strings.pdb \
      zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
+  if [ -d storage/innodb_plugin ]; then
+    cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.pdb \
+       $DESTDIR/lib/plugin/
+  fi
 fi
 
+
 if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
      x"$PACK_DEBUG" = x"yes" ] ; then
   mkdir -p $DESTDIR/lib/debug
+  mkdir -p $DESTDIR/lib/plugin/debug
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
      libmysql/debug/libmysql.pdb \
@@ -309,6 +321,12 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysq
      strings/debug/strings.pdb \
      zlib/debug/zlib.lib \
      zlib/debug/zlib.pdb $DESTDIR/lib/debug/
+  if [ -d storage/innodb_plugin ]; then
+    cp storage/innodb_plugin/debug/ha_innodb_plugin.dll \
+       storage/innodb_plugin/debug/ha_innodb_plugin.lib \
+       storage/innodb_plugin/debug/ha_innodb_plugin.pdb \
+       $DESTDIR/lib/plugin/debug/
+  fi
 fi
 
 # ----------------------------------------------------------------------

=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2009-02-11 12:11:20 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	2009-09-21 18:33:08 +0000
@@ -13,7 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-testdir=$(prefix)/mysql-test/ndb
+testroot=$(prefix)
+testdir=$(testroot)/mysql-test/ndb
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2009-09-17 14:36:39 +0000
+++ b/support-files/mysql.spec.sh	2009-09-21 18:33:08 +0000
@@ -304,9 +304,6 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH
 	    --enable-thread-safe-client \
 	    --with-readline \
 	    --with-innodb \
-%if %{WITHOUT_INNODB_PLUGIN}
-	    --without-plugin-innodb_plugin \
-%endif
 %if %{CLUSTER_BUILD}
 	    --with-ndbcluster \
 %else
@@ -316,8 +313,10 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH
 	    --with-plugin-csv \
 	    --with-plugin-blackhole \
 	    --with-plugin-federated \
+	    --without-plugin-audit_null \
 	    --without-plugin-daemon_example \
 	    --without-plugin-example \
+	    --without-plugin-ftexample \
 	    --with-plugin-partition \
 	    --with-big-tables \
 %if %{WITH_BUNDLED_ZLIB}
@@ -386,8 +385,7 @@ CFLAGS="$CFLAGS" \
 CXXFLAGS="$CXXFLAGS" \
 BuildMySQL "\
 		--with-debug \
-		--with-comment=\"MySQL Community Server - Debug (%{mysql_license})\" \
-")
+		--with-comment=\"MySQL Community Server - Debug (%{mysql_license})\"")
 
 # We might want to save the config log file
 if test -n "$MYSQL_DEBUGCONFLOG_DEST"
@@ -447,7 +445,7 @@ install -d $RBR%{_mandir}
 install -d $RBR%{_sbindir}
 
 
-# Install all binaries 
+# Install all binaries
 (cd $MBD && make install DESTDIR=$RBR testroot=%{_datadir})
 # Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
 # the same here.
@@ -700,7 +698,6 @@ fi
 %attr(755, root, root) %{_bindir}/myisampack
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
-%attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
 %attr(755, root, root) %{_bindir}/mysql_install_db
 %attr(755, root, root) %{_bindir}/mysql_secure_installation
 %attr(755, root, root) %{_bindir}/mysql_setpermission
@@ -718,14 +715,10 @@ fi
 %attr(755, root, root) %{_bindir}/resolve_stack_dump
 %attr(755, root, root) %{_bindir}/resolveip
 
-%attr(755, root, root) %{_libdir}/plugin/*.so*
-
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
 
-%attr(755, root, root) %{_libdir}/mysql/plugin/*.so*
-
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
 
@@ -849,16 +842,6 @@ fi
 %{_libdir}/mysql/libvio.a
 %{_libdir}/mysql/libz.a
 %{_libdir}/mysql/libz.la
-%{_libdir}/mysql/plugin/adt_null.a
-%{_libdir}/mysql/plugin/adt_null.la
-%{_libdir}/mysql/plugin/ha_example.a
-%{_libdir}/mysql/plugin/ha_example.la
-%{_libdir}/mysql/plugin/libdaemon_example.a
-%{_libdir}/mysql/plugin/libdaemon_example.la
-%{_libdir}/mysql/plugin/mypluglib.a
-%{_libdir}/mysql/plugin/mypluglib.la
-%{_libdir}/plugin/*.a
-%{_libdir}/plugin/*.la
 
 %files shared
 %defattr(-, root, root, 0755)
@@ -888,6 +871,12 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
+* Mon Sep 21 2009 Jonathan Perkin <jperkin@stripped>
+
+- Merge changes from 5.1.38 and 5.1.39.
+- Reduce diffs to mysql-5.1 slightly
+- Disable audit_null and ftexample plugins.
+
 * Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@stripped>
 
 - Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
@@ -904,9 +893,9 @@ fi
 * Fri Aug 21 2009 Jonathan Perkin <jperkin@stripped>
 
 - Install plugin libraries in appropriate packages.
-- Disable example plugins.
+- Disable libdaemon_example and ftexample plugins.
 
-* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
 
 - Update variable used for mysql-test suite location to match source.
 

Thread
bzr push into mysql-6.0 branch (jperkin:3604) Jonathan Perkin21 Sep