Hi Sergey,
Here is the diff of the extra stuff that Jani and Monty merged, but which is
not included in MySQL-5.1.38.
As can be seen, none of it really matters (except the version number; I'll fix
that to be 5.1.38-maria-beta1).
I suggest we just leave it in place to simplify future merges.
Still, hopefully the next time we merge, we will make sure we merge some
well-defined release of MySQL ;-)
- Kristian.
=== modified file '.bzrignore'
--- .bzrignore 2009-02-27 11:20:53 +0000
+++ .bzrignore 2009-08-12 19:45:01 +0000
@@ -3063,3 +3063,4 @@ sql/share/slovak
sql/share/spanish
sql/share/swedish
sql/share/ukrainian
+libmysqld/examples/mysqltest.cc
=== modified file 'configure.in'
--- configure.in 2009-07-13 20:43:31 +0000
+++ configure.in 2009-08-13 20:33:00 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
#
# When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.38)
+AM_INIT_AUTOMAKE(mysql, 5.1.39)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
=== modified file 'man/Makefile.am'
--- man/Makefile.am 2008-08-27 14:03:39 +0000
+++ man/Makefile.am 2009-08-20 19:41:12 +0000
@@ -23,7 +23,7 @@ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
# "make_win_*" are not needed in Unix binary packages,
install-data-hook:
- rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
+ rm -f $(DESTDIR)$(mandir)/man1/make_win_*
# Don't update the files from bitkeeper
%::SCCS/s.%
=== modified file 'mysql-test/collections/default.daily'
--- mysql-test/collections/default.daily 2009-02-24 11:53:34 +0000
+++ mysql-test/collections/default.daily 2009-08-12 15:10:15 +0000
@@ -1 +1 @@
-perl mysql-test-run.pl --timer --force --comment=rpl_ndb_row
--suite=rpl_ndb,ndb --mysqld=--binlog-format=row
--experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --comment=rpl_ndb_row
--vardir=var-rpl_ndb_row --suite=rpl_ndb,ndb --mysqld=--binlog-format=row
--experimental=collections/default.experimental
=== modified file 'mysql-test/collections/default.push'
--- mysql-test/collections/default.push 2009-06-03 10:46:04 +0000
+++ mysql-test/collections/default.push 2009-08-12 15:10:15 +0000
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix
--mysqld=--binlog-format=mixed --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row
--ps-protocol --mysqld=--binlog-format=row
--experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded
--embedded --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto
--comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row
--experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1
--suite=funcs_1 --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix
--vardir=var-n_mix --mysqld=--binlog-format=mixed
--experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=ps_row
--vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row
--experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=embedded
--vardir=var-emebbed --embedded --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto
--comment=rpl_binlog_row --vardir=var-rpl_binlog_row --suite=rpl,binlog
--mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=funcs_1
--vardir=var-funcs_1 --suite=funcs_1
--experimental=collections/default.experimental
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- mysql-test/lib/mtr_cases.pm 2009-07-30 12:42:56 +0000
+++ mysql-test/lib/mtr_cases.pm 2009-08-12 12:46:12 +0000
@@ -494,6 +494,7 @@ sub collect_one_suite($)
next if ($test->{'skip'} || !$test->{'innodb_test'});
# Exceptions
next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno
(fk)
+ next if ($test->{'name'} eq 'main.index_merge_innodb'); # Explain diff
# innodb_file_per_table is rw with innodb_plugin
next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic');
# innodb_lock_wait_timeout is rw with innodb_plugin
=== modified file 'storage/innodb_plugin/include/btr0cur.h'
--- storage/innodb_plugin/include/btr0cur.h 2009-05-27 09:45:59 +0000
+++ storage/innodb_plugin/include/btr0cur.h 2009-08-12 19:43:20 +0000
@@ -618,7 +618,7 @@ enum btr_cur_method {
hash_node, and might be necessary to
update */
BTR_CUR_BINARY, /*!< success using the binary search */
- BTR_CUR_INSERT_TO_IBUF, /*!< performed the intended insert to
+ BTR_CUR_INSERT_TO_IBUF /*!< performed the intended insert to
the insert buffer */
};
=== modified file 'storage/innodb_plugin/include/trx0types.h'
--- storage/innodb_plugin/include/trx0types.h 2009-07-30 12:42:56 +0000
+++ storage/innodb_plugin/include/trx0types.h 2009-08-12 19:43:20 +0000
@@ -70,7 +70,7 @@ typedef struct trx_named_savept_struct t
enum trx_rb_ctx {
RB_NONE = 0, /*!< no rollback */
RB_NORMAL, /*!< normal rollback */
- RB_RECOVERY, /*!< rolling back an incomplete transaction,
+ RB_RECOVERY /*!< rolling back an incomplete transaction,
in crash recovery */
};
=== modified file 'support-files/mysql.spec.sh'
--- support-files/mysql.spec.sh 2009-05-27 15:14:09 +0000
+++ support-files/mysql.spec.sh 2009-08-24 09:13:34 +0000
@@ -31,6 +31,20 @@
%{?_with_yassl:%define YASSL_BUILD 1}
%{!?_with_yassl:%define YASSL_BUILD 0}
+# ----------------------------------------------------------------------
+# use "rpmbuild --with bundled_zlib" or "rpm --define '_with_bundled_zlib 1'"
+# (for RPM 3.x) to build using the bundled zlib (off by default)
+# ----------------------------------------------------------------------
+%{?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 1}
+%{!?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 0}
+
+# ----------------------------------------------------------------------
+# use "rpmbuild --without innodb_plugin" or "rpm --define
'_without_innodb_plugin 1'"
+# (for RPM 3.x) to not build the innodb plugin (on by default with innodb
builds)
+# ----------------------------------------------------------------------
+%{?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 1}
+%{!?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 0}
+
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM
3.x)
# to build with cluster support (off by default)
%{?_with_cluster:%define CLUSTER_BUILD 1}
@@ -292,6 +306,9 @@ 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
@@ -301,8 +318,13 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH
--with-csv-storage-engine \
--with-blackhole-storage-engine \
--with-federated-storage-engine \
+ --without-plugin-daemon_example \
+ --without-plugin-example \
--with-partition \
--with-big-tables \
+%if %{WITH_BUNDLED_ZLIB}
+ --with-zlib-dir=bundled \
+%endif
--enable-shared \
"
make
@@ -426,7 +448,7 @@ install -d $RBR%{_sbindir}
# Install all binaries
-(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
+(cd $MBD && make install DESTDIR=$RBR testroot=%{_datadir})
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
# the same here.
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
@@ -693,6 +715,8 @@ 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}/mysqlmanager
@@ -818,6 +842,8 @@ fi
%{_libdir}/mysql/libvio.a
%{_libdir}/mysql/libz.a
%{_libdir}/mysql/libz.la
+%{_libdir}/plugin/*.a
+%{_libdir}/plugin/*.la
%files shared
%defattr(-, root, root, 0755)
@@ -847,6 +873,19 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Mon Aug 24 2009 Jonathan Perkin <[email protected]>
+
+- Add conditionals for bundled zlib and innodb plugin
+
+* Fri Aug 21 2009 Jonathan Perkin <[email protected]>
+
+- Install plugin libraries in appropriate packages.
+- Disable example plugins.
+
+* Thu Aug 20 2009 Jonathan Perkin <jper...@stripped>
+
+- Update variable used for mysql-test suite location to match source.
+
* Fri Nov 07 2008 Joerg Bruehe <[email protected]>
- Correct yesterday's fix, so that it also works for the last flag,
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
