Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2012-02-16 10:06:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2011-11-05 11:26:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2012-02-16 10:06:12.000000000 +0100
@@ -1,0 +2,26 @@
+Mon Jan 30 08:46:31 UTC 2012 - mhrusecky@suse.cz
+
+- adding /ush/share/aclocal in files
+- renaming *-debug package to *-debug-version to avoid conflicts
+
+-------------------------------------------------------------------
+Mon Jan 30 08:23:32 UTC 2012 - mhrusecky@suse.cz
+
+- adding missing buildrequires (fixes build for factory)
+
+-------------------------------------------------------------------
+Thu Dec 8 10:39:05 CET 2011 - mhrusecky@suse.cz
+
+- migrated to the new common template
+- updated to MariaDB 5.2.10
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-5210-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-5210-changelog
+
+-------------------------------------------------------------------
+Wed Nov 23 09:27:43 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
Old:
----
changes.factory
default_plugins.cnf
mariadb-5.2.9.tar.bz2
mariadb-strict-aliasing.patch
New:
----
configuration-tweaks.tar.bz2
mariadb-5.2.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
++++ 748 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/mariadb/mariadb.spec
++++ and /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.spec
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.6AGShX/_old 2012-02-16 10:06:14.000000000 +0100
+++ /var/tmp/diff_new_pack.6AGShX/_new 2012-02-16 10:06:14.000000000 +0100
@@ -1,2 +1,2 @@
-libmysqlclient16
-libmysqlclient_r16
+libmariadbclient16
+libmariadbclient_r16
++++++ build.inc ++++++
--- /var/tmp/diff_new_pack.6AGShX/_old 2012-02-16 10:06:14.000000000 +0100
+++ /var/tmp/diff_new_pack.6AGShX/_new 2012-02-16 10:06:14.000000000 +0100
@@ -3,13 +3,14 @@
%else
%define socketpath /var/run/mysql
%endif
-autoreconf -f -i
-export WARN_DIS=" -Wno-unused-parameter "
%if 0%{?suse_version} > 1140
-export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable "
+export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
%endif
-export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS"
+export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS "
export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
+
+%if 0%{use_cmake} < 1
+autoreconf -f -i
# Make the compile a function, since we do multiple builds
BuildMySQL() {
# The --enable-assembler simply does nothing on systems that do not
@@ -18,7 +19,6 @@
mkdir _build$suffix
pushd _build$suffix
../configure \
- --with-libevent \
--enable-assembler \
--without-readline \
--infodir=%{_infodir} \
@@ -48,6 +48,7 @@
%endif
--with-ssl=/usr \
--with-plugins=%{builtin_plugins} \
+ --without-plugin-handlersocket \
HOSTNAME="/bin/hostname -f" \
"$@"
# Add this for MyISAM RAID support:
@@ -69,7 +70,11 @@
popd
}
# Build the client, extra tools, libraries
+%if 0%{?prefered} > 0
+BuildMySQL "" --with-embedded-server
+%else
BuildMySQL "" --without-embedded-server
+%endif
# build mysqld-debug
BuildMySQL "-debug" --with-debug --without-embedded-server
@@ -85,3 +90,31 @@
cd ..
%endif
+%else # cmake build
+
+BuildMySQL() {
+ mkdir _build$1
+ pushd _build$1
+ shift
+ cmake -DWITH_SSL=system \
+ -DWITH_ZLIB=system \
+ -DWITH_READLINE=0 \
+ -DWITH_LIBEDIT=0 \
+ -DINSTALL_LAYOUT=RPM \
+ -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \
+ -DWITH_COMMENT="openSUSE MySQL rpm" \
+ -DWITH_EXTRA_CHARSET=all \
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
+ -DWITH_EMBEDDED_SERVER=true \
+ -DDENABLE_DOWNLOADS=false \
+ "$@" ..
+ make %{?jobs:-j%jobs}
+ nm --numeric-sort sql/mysqld > sql/mysqld.sym
+ popd
+}
+
+BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share
+BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug
+%endif
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.6AGShX/_old 2012-02-16 10:06:14.000000000 +0100
+++ /var/tmp/diff_new_pack.6AGShX/_new 2012-02-16 10:06:14.000000000 +0100
@@ -7,14 +7,20 @@
# install the client, extra tools, libraries and the standard server
make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
+# remove handler socket client
+rm -f %buildroot%_libdir/libhsclient*
+rm -f %buildroot%_bindir/hsclient*
+rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
# remove most static libs (FIXME: don't build them at all...)
rm -f %buildroot%_libdir/libmysqlclient*a
+rm -f %buildroot%_libdir/libmysqlservices*a
rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la
rm -f %buildroot%_libdir/mysql/plugin/*a
# XXX: package these? The ndb tools are linked statically atm
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run
-rm -f %{buildroot}/usr/share/mysql-test/mtr
+rm -f %{buildroot}/usr/share/mysql-test/mtr
+rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
@@ -45,29 +51,33 @@
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
-filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files
+filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
-filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files
+filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table,select_all} >mysql-ndb-extra.files
### files not installed by make install
# Create directory structure
-DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE)
+DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini)
DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
install -d -m 755 %buildroot/etc/init.d
install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
-%if 0%{?prefered} > 0
+%if 0%{?prefered} > 0%{?use_cmake}
install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
%endif
install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf
install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
-install -m 644 "${DOCS[@]}" ${DOCDIR}
+for i in "${DOCS[@]}"; do
+ install -m 644 "${i}" "${DOCDIR}" || true
+done
install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql
+# this is used by the init script
+install -m 755 -d %buildroot/var/run/mysql
# SuSEfirewall service description
install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
@@ -108,14 +118,17 @@
rm -rf '%buildroot'/%_libdir/libmysqld.*
rm -rf '%buildroot'/%_libdir/*.la
rm -rf '%buildroot'/%_libdir/*.so
-rm -rf '%buildroot'/%_libdir/*.a
rm -rf '%buildroot'/%_includedir
rm -rf '%buildroot'/%_datadir/man/*/mysql_config*
rm -rf '%buildroot'/%_datadir/aclocal
+rm -rf '%buildroot'/%_libdir/*.a
%endif
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
+if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then
+ mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf
+fi
mkdir -p '%buildroot'/etc/mysql
-[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql
+bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf -
++++++ mariadb-5.2.9.tar.bz2 -> mariadb-5.2.10.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/mariadb/mariadb-5.2.9.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-5.2.10.tar.bz2 differ: char 11, line 1
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.10-compilation-fix.patch new/mysql-patches/mysql-patches/mariadb-5.2.10-compilation-fix.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.10-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.2.10-compilation-fix.patch 2011-12-07 22:01:19.000000000 +0100
@@ -0,0 +1,216 @@
+PATCH-P0-HACK-SUSE: Fixing few compilation problems
+
+Mostly minor things. Mostly just to make compiler happy as it can't determine
+that everything is ok. But few things might actually worth reporting as they
+could be handled better (mostly the write calls).
+
+Maintainer: Michal Hrusecky
+
+Index: client/readline.cc
+===================================================================
+--- client/readline.cc.orig
++++ client/readline.cc
+@@ -57,7 +57,7 @@ LINE_BUFFER *batch_readline_init(ulong m
+ char *batch_readline(LINE_BUFFER *line_buff)
+ {
+ char *pos;
+- ulong out_length;
++ ulong out_length=0;
+ LINT_INIT(out_length);
+
+ if (!(pos=intern_read_line(line_buff, &out_length)))
+Index: storage/innodb_plugin/ut/ut0ut.c
+===================================================================
+--- storage/innodb_plugin/ut/ut0ut.c.orig
++++ storage/innodb_plugin/ut/ut0ut.c
+@@ -553,7 +553,9 @@ ut_print_namel(
+ trx ? trx->mysql_thd : NULL,
+ table_id);
+
+- fwrite(buf, 1, bufend - buf, f);
++ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) {
++ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n");
++ }
+ }
+
+ /**********************************************************************//**
+@@ -574,7 +576,8 @@ ut_copy_file(
+ ? (size_t) len
+ : sizeof buf;
+ size_t size = fread(buf, 1, maxs, src);
+- fwrite(buf, 1, size, dest);
++ if(fwrite(buf, size, 1, dest)is_null())
+- fwrite("NULL", sizeof(char), 4, DBUG_FILE);
++ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4)
++ break;
+
+ if (field->type() == MYSQL_TYPE_BIT)
+ (void) field->val_int_as_str(&tmp, 1);
+ else
+ field->val_str(&tmp);
+
+- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE);
++ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) !=
++ sizeof(char) * tmp.length())
++ break;
+ if (pfield[1])
+- fwrite(", ", sizeof(char), 2, DBUG_FILE);
++ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2)
++ break;
+ }
+ fprintf(DBUG_FILE, ")");
+ if (print_rowid)
+Index: sql/opt_range.cc
+===================================================================
+--- sql/opt_range.cc.orig
++++ sql/opt_range.cc
+@@ -11377,7 +11377,8 @@ print_key(KEY_PART *key_part, const ucha
+ {
+ if (*key)
+ {
+- fwrite("NULL",sizeof(char),4,DBUG_FILE);
++ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char))
++ break;
+ continue;
+ }
+ key++; // Skip null byte
+@@ -11388,7 +11389,8 @@ print_key(KEY_PART *key_part, const ucha
+ (void) field->val_int_as_str(&tmp, 1);
+ else
+ field->val_str(&tmp);
+- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE);
++ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length())
++ break;
+ if (key+store_length < key_end)
+ fputc('/',DBUG_FILE);
+ }
+Index: sql/debug_sync.cc
+===================================================================
+--- sql/debug_sync.cc.orig
++++ sql/debug_sync.cc
+@@ -1722,6 +1722,7 @@ static void debug_sync_execute(THD *thd,
+ LINT_INIT(old_proc_info);
+
+ action->execute--;
++ old_proc_info = NULL;
+
+ /*
+ If we will be going to wait, set proc_info for the PROCESSLIST table.
+Index: storage/xtradb/ut/ut0ut.c
+===================================================================
+--- storage/xtradb/ut/ut0ut.c.orig
++++ storage/xtradb/ut/ut0ut.c
+@@ -552,8 +552,9 @@ ut_print_namel(
+ name, namelen,
+ trx ? trx->mysql_thd : NULL,
+ table_id);
+-
+- (void) fwrite(buf, 1, bufend - buf, f);
++ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) {
++ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n");
++ }
+ }
+
+ /**********************************************************************//**
+@@ -574,7 +575,8 @@ ut_copy_file(
+ ? (size_t) len
+ : sizeof buf;
+ size_t size = fread(buf, 1, maxs, src);
+- (void) fwrite(buf, 1, size, dest);
++ if(fwrite(buf, size, 1, dest)data_file_name.str;
+ char real_data_name[FN_REFLEN];
+
+ if (org_name)
+@@ -1834,12 +1833,11 @@ int _ma_open_datafile(MARIA_HA *info, MA
+ my_errno= HA_WRONG_CREATE_OPTION;
+ return 1;
+ }
+- data_name= real_data_name;
+ }
+ }
+
+ info->dfile.file= share->bitmap.file.file=
+- my_open(data_name, share->mode | O_SHARE, MYF(MY_WME));
++ my_open(real_data_name, share->mode | O_SHARE, MYF(MY_WME));
+ return info->dfile.file >= 0 ? 0 : 1;
+ }
+
+Index: storage/maria/ha_maria.cc
+===================================================================
+--- storage/maria/ha_maria.cc.orig
++++ storage/maria/ha_maria.cc
+@@ -2834,7 +2834,7 @@ int ha_maria::create(const char *name, r
+ HA_CREATE_INFO *ha_create_info)
+ {
+ int error;
+- uint create_flags= 0, record_count, i;
++ uint create_flags= 0, record_count=0, i;
+ char buff[FN_REFLEN];
+ MARIA_KEYDEF *keydef;
+ MARIA_COLUMNDEF *recinfo;
+Index: storage/pbxt/src/discover_xt.cc
+===================================================================
+--- storage/pbxt/src/discover_xt.cc.orig
++++ storage/pbxt/src/discover_xt.cc
+@@ -1337,8 +1337,8 @@ static bool mysql_create_table_no_lock(T
+ char path[FN_REFLEN];
+ uint path_length;
+ const char *alias;
+- uint db_options, key_count;
+- KEY *key_info_buffer;
++ uint db_options, key_count=0;
++ KEY *key_info_buffer=NULL;
+ handler *file;
+ bool error= TRUE;
+ DBUG_ENTER("mysql_create_table_no_lock");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.10-myslq-test.patch new/mysql-patches/mysql-patches/mariadb-5.2.10-myslq-test.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.10-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.2.10-myslq-test.patch 2011-12-07 14:43:22.000000000 +0100
@@ -0,0 +1,33 @@
+PATCH-P0-FEATURE-SUSE: Tests in $(datadir)
+
+By default tests would get installed to /usr and as we want it LSB compilant,
+we install them into /usr/share.
+
+Maintainer: Michal Hrusecky
+
+Index: mysql-test/Makefile.am
+===================================================================
+--- mysql-test/Makefile.am.orig
++++ mysql-test/Makefile.am
+@@ -17,7 +17,7 @@
+
+ ## Process this file with automake to create Makefile.in
+
+-testroot = $(prefix)
++testroot = $(datadir)
+ testdir = $(testroot)/mysql-test
+
+ test_SCRIPTS = mtr \
+Index: mysql-test/lib/My/SafeProcess/Makefile.am
+===================================================================
+--- mysql-test/lib/My/SafeProcess/Makefile.am.orig
++++ mysql-test/lib/My/SafeProcess/Makefile.am
+@@ -14,7 +14,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+-testroot = $(prefix)
++testroot = $(datadir)
+ safedir = $(testroot)/mysql-test/lib/My/SafeProcess
+ #nobase_bin_PROGRAMS = ...
+ safe_PROGRAMS = my_safe_process
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.10-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mariadb-5.2.10-plugins-avoid-version.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.10-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.2.10-plugins-avoid-version.patch 2011-12-08 10:38:24.000000000 +0100
@@ -0,0 +1,140 @@
+PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins
+
+Making all storage plugins unversioned.
+
+Maintainer: Michal Hrusecky
+
+Index: storage/blackhole/Makefile.am
+===================================================================
+--- storage/blackhole/Makefile.am.orig
++++ storage/blackhole/Makefile.am
+@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h
+
+ EXTRA_LTLIBRARIES = libblackhole.la ha_blackhole.la
+ pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@
+-ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
++ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
+ ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_blackhole_la_SOURCES=ha_blackhole.cc
+
+Index: storage/archive/Makefile.am
+===================================================================
+--- storage/archive/Makefile.am.orig
++++ storage/archive/Makefile.am
+@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r
+
+ EXTRA_LTLIBRARIES = libarchive.la ha_archive.la
+ pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@
+-ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir)
++ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
+ ha_archive_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_archive_la_SOURCES = ha_archive.cc azio.c
+Index: storage/example/Makefile.am
+===================================================================
+--- storage/example/Makefile.am.orig
++++ storage/example/Makefile.am
+@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h
+
+ EXTRA_LTLIBRARIES = libexample.la ha_example.la
+ pkgplugin_LTLIBRARIES = @plugin_example_shared_target@
+-ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
++ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+ ha_example_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_example_la_SOURCES = ha_example.cc
+
+Index: storage/federated/Makefile.am
+===================================================================
+--- storage/federated/Makefile.am.orig
++++ storage/federated/Makefile.am
+@@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h
+
+ EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la ha_federated.la
+ pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
+-ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) \
++ha_federated_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) \
+ -L$(top_builddir)/libservices -lmysqlservices
+ ha_federated_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_federated_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+Index: storage/innodb_plugin/Makefile.am
+===================================================================
+--- storage/innodb_plugin/Makefile.am.orig
++++ storage/innodb_plugin/Makefile.am
+@@ -330,7 +330,7 @@ libinnobase_la_CFLAGS= $(AM_CFLAGS)
+ EXTRA_LTLIBRARIES= libinnobase.la ha_innodb_plugin.la
+ pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@
+
+-ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
++ha_innodb_plugin_la_LDFLAGS= -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+ ha_innodb_plugin_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES)
+Index: plugin/auth/Makefile.am
+===================================================================
+--- plugin/auth/Makefile.am.orig
++++ plugin/auth/Makefile.am
+@@ -1,6 +1,6 @@
+ pkgplugindir=$(pkglibdir)/plugin
+
+-AM_LDFLAGS=-module -rpath $(pkgplugindir)
++AM_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
+ AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -I$(top_srcdir)/include
+
+ pkgplugin_LTLIBRARIES= dialog.la
+Index: storage/federatedx/Makefile.am
+===================================================================
+--- storage/federatedx/Makefile.am.orig
++++ storage/federatedx/Makefile.am
+@@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat
+
+ EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la
+ pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@
+-ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) \
++ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) \
+ -L$(top_builddir)/libservices -lmysqlservices
+ ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+
+Index: storage/sphinx/Makefile.am
+===================================================================
+--- storage/sphinx/Makefile.am.orig
++++ storage/sphinx/Makefile.am
+@@ -33,13 +33,13 @@ noinst_HEADERS = ha_sphinx.h
+ EXTRA_LTLIBRARIES = libsphinx.la ha_sphinx.la
+ pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
+
+-ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \
++ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \
+ -L$(top_builddir)/libservices -lmysqlservices
+ ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_SOURCES = ha_sphinx.cc
+
+-sphinx_la_LDFLAGS = -module
++sphinx_la_LDFLAGS = -module -avoid-version
+ sphinx_la_CXXFLAGS = $(AM_CXXFLAGS)
+ sphinx_la_CFLAGS = $(AM_CFLAGS)
+ sphinx_la_SOURCES = snippets_udf.cc
+Index: plugin/feedback/Makefile.am
+===================================================================
+--- plugin/feedback/Makefile.am.orig
++++ plugin/feedback/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/
+
+ EXTRA_LTLIBRARIES = feedback.la libfeedback.la
+ pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@
+-feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
++feedback_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+ feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN
+ feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \
+ sender_thread.cc
+Index: plugin/fulltext/Makefile.am
+===================================================================
+--- plugin/fulltext/Makefile.am.orig
++++ plugin/fulltext/Makefile.am
+@@ -20,5 +20,5 @@ INCLUDES= -I$(top_builddir)/include -I$(
+ #noinst_LTLIBRARIES= mypluglib.la
+ pkgplugin_LTLIBRARIES= mypluglib.la
+ mypluglib_la_SOURCES= plugin_example.c
+-mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
++mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
+ mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-compilation-fix.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-compilation-fix.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.6-compilation-fix.patch 2011-05-16 23:01:17.000000000 +0200
+++ new/mysql-patches/mysql-patches/mariadb-5.2.6-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,305 +0,0 @@
-PATCH-P0-HACK-SUSE: Fixing few compilation problems
-
-Mostly minor things. Mostly just to make compiler happy as it can't determine
-that everything is ok. But few things might actually worth reporting as they
-could be handled better (mostly the write calls).
-
-Maintainer: Michal Hrusecky
-
-Index: client/readline.cc
-===================================================================
---- client/readline.cc.orig
-+++ client/readline.cc
-@@ -55,7 +55,7 @@ LINE_BUFFER *batch_readline_init(ulong m
- char *batch_readline(LINE_BUFFER *line_buff)
- {
- char *pos;
-- ulong out_length;
-+ ulong out_length=0;
- LINT_INIT(out_length);
-
- if (!(pos=intern_read_line(line_buff, &out_length)))
-Index: storage/innodb_plugin/ut/ut0ut.c
-===================================================================
---- storage/innodb_plugin/ut/ut0ut.c.orig
-+++ storage/innodb_plugin/ut/ut0ut.c
-@@ -553,7 +553,9 @@ ut_print_namel(
- trx ? trx->mysql_thd : NULL,
- table_id);
-
-- fwrite(buf, 1, bufend - buf, f);
-+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) {
-+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n");
-+ }
- }
-
- /**********************************************************************//**
-@@ -574,7 +576,8 @@ ut_copy_file(
- ? (size_t) len
- : sizeof buf;
- size_t size = fread(buf, 1, maxs, src);
-- fwrite(buf, 1, size, dest);
-+ if(fwrite(buf, size, 1, dest)is_null())
-- fwrite("NULL", sizeof(char), 4, DBUG_FILE);
-+ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4)
-+ break;
-
- if (field->type() == MYSQL_TYPE_BIT)
- (void) field->val_int_as_str(&tmp, 1);
- else
- field->val_str(&tmp);
-
-- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE);
-+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) !=
-+ sizeof(char) * tmp.length())
-+ break;
- if (pfield[1])
-- fwrite(", ", sizeof(char), 2, DBUG_FILE);
-+ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2)
-+ break;
- }
- fprintf(DBUG_FILE, ")");
- if (print_rowid)
-Index: sql/opt_range.cc
-===================================================================
---- sql/opt_range.cc.orig
-+++ sql/opt_range.cc
-@@ -11376,7 +11376,8 @@ print_key(KEY_PART *key_part, const ucha
- {
- if (*key)
- {
-- fwrite("NULL",sizeof(char),4,DBUG_FILE);
-+ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char))
-+ break;
- continue;
- }
- key++; // Skip null byte
-@@ -11387,7 +11388,8 @@ print_key(KEY_PART *key_part, const ucha
- (void) field->val_int_as_str(&tmp, 1);
- else
- field->val_str(&tmp);
-- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE);
-+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length())
-+ break;
- if (key+store_length < key_end)
- fputc('/',DBUG_FILE);
- }
-Index: sql/sql_table.cc
-===================================================================
---- sql/sql_table.cc.orig
-+++ sql/sql_table.cc
-@@ -7084,7 +7084,7 @@ view_err:
- need_copy_table= ALTER_TABLE_DATA_CHANGED;
- else
- {
-- enum_alter_table_change_level need_copy_table_res;
-+ enum_alter_table_change_level need_copy_table_res = ALTER_TABLE_DATA_CHANGED;
- /* Check how much the tables differ. */
- if (compare_tables(table, alter_info,
- create_info, order_num,
-Index: sql/debug_sync.cc
-===================================================================
---- sql/debug_sync.cc.orig
-+++ sql/debug_sync.cc
-@@ -1722,6 +1722,7 @@ static void debug_sync_execute(THD *thd,
- LINT_INIT(old_proc_info);
-
- action->execute--;
-+ old_proc_info = NULL;
-
- /*
- If we will be going to wait, set proc_info for the PROCESSLIST table.
-Index: unittest/mysys/lf-t.c
-===================================================================
---- unittest/mysys/lf-t.c.orig
-+++ unittest/mysys/lf-t.c
-@@ -33,14 +33,13 @@ LF_HASH lf_hash;
- pthread_handler_t test_lf_pinbox(void *arg)
- {
- int m= *(int *)arg;
-- int32 x= 0;
- LF_PINS *pins;
-
- my_thread_init();
-
- pins= lf_pinbox_get_pins(&lf_allocator.pinbox);
-
-- for (x= ((int)(intptr)(&m)); m ; m--)
-+ for (; m ; m--)
- {
- lf_pinbox_put_pins(pins);
- pins= lf_pinbox_get_pins(&lf_allocator.pinbox);
-Index: storage/xtradb/ut/ut0ut.c
-===================================================================
---- storage/xtradb/ut/ut0ut.c.orig
-+++ storage/xtradb/ut/ut0ut.c
-@@ -552,8 +552,9 @@ ut_print_namel(
- name, namelen,
- trx ? trx->mysql_thd : NULL,
- table_id);
--
-- (void) fwrite(buf, 1, bufend - buf, f);
-+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) {
-+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n");
-+ }
- }
-
- /**********************************************************************//**
-@@ -574,7 +575,8 @@ ut_copy_file(
- ? (size_t) len
- : sizeof buf;
- size_t size = fread(buf, 1, maxs, src);
-- (void) fwrite(buf, 1, size, dest);
-+ if(fwrite(buf, size, 1, dest)s->pack.header_length;
-
- /* Check how to calculate checksum of rows */
-- static_row_size=1;
- if (info->s->data_file_type == COMPRESSED_RECORD)
- {
- for (field=0 ; field < info->s->base.fields ; field++)
-@@ -980,7 +978,6 @@ int chk_data_link(HA_CHECK *param, MI_IN
- if (info->s->rec[field].base_type == FIELD_BLOB ||
- info->s->rec[field].base_type == FIELD_VARCHAR)
- {
-- static_row_size=0;
- break;
- }
- }
-Index: storage/innodb_plugin/btr/btr0cur.c
-===================================================================
---- storage/innodb_plugin/btr/btr0cur.c.orig
-+++ storage/innodb_plugin/btr/btr0cur.c
-@@ -3252,6 +3252,8 @@ btr_record_not_null_field_in_rec(
- /* Break if we hit the first NULL value */
- break;
- }
-+ if(field == NULL)
-+ break;
- }
- }
-
-Index: storage/maria/ma_open.c
-===================================================================
---- storage/maria/ma_open.c.orig
-+++ storage/maria/ma_open.c
-@@ -1802,7 +1802,6 @@ void _ma_set_index_pagecache_callbacks(P
- int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name,
- File file_to_dup __attribute__((unused)))
- {
-- char *data_name= share->data_file_name.str;
- char real_data_name[FN_REFLEN];
-
- if (org_name)
-@@ -1816,7 +1815,6 @@ int _ma_open_datafile(MARIA_HA *info, MA
- my_errno= HA_WRONG_CREATE_OPTION;
- return 1;
- }
-- data_name= real_data_name;
- }
- }
-
-Index: storage/maria/ma_key_recover.c
-===================================================================
---- storage/maria/ma_key_recover.c.orig
-+++ storage/maria/ma_key_recover.c
-@@ -944,7 +944,7 @@ uint _ma_apply_redo_index(MARIA_HA *info
- uchar *buff;
- const uchar *header_end= header + head_length;
- uint page_offset= 0, org_page_length;
-- uint nod_flag, page_length, keypage_header, keynr;
-+ uint page_length, keypage_header, keynr;
- uint max_page_size= share->max_index_block_size;
- int result;
- MARIA_PAGE page;
-@@ -972,7 +972,6 @@ uint _ma_apply_redo_index(MARIA_HA *info
-
- keynr= _ma_get_keynr(share, buff);
- _ma_page_setup(&page, info, share->keyinfo + keynr, page_pos, buff);
-- nod_flag= page.node;
- org_page_length= page_length= page.size;
-
- keypage_header= share->keypage_header;
-Index: storage/maria/ha_maria.cc
-===================================================================
---- storage/maria/ha_maria.cc.orig
-+++ storage/maria/ha_maria.cc
-@@ -2817,7 +2817,7 @@ int ha_maria::create(const char *name, r
- HA_CREATE_INFO *ha_create_info)
- {
- int error;
-- uint create_flags= 0, record_count, i;
-+ uint create_flags= 0, record_count=0, i;
- char buff[FN_REFLEN];
- MARIA_KEYDEF *keydef;
- MARIA_COLUMNDEF *recinfo;
-Index: storage/pbxt/src/discover_xt.cc
-===================================================================
---- storage/pbxt/src/discover_xt.cc.orig
-+++ storage/pbxt/src/discover_xt.cc
-@@ -1337,8 +1337,8 @@ static bool mysql_create_table_no_lock(T
- char path[FN_REFLEN];
- uint path_length;
- const char *alias;
-- uint db_options, key_count;
-- KEY *key_info_buffer;
-+ uint db_options, key_count=0;
-+ KEY *key_info_buffer=NULL;
- handler *file;
- bool error= TRUE;
- DBUG_ENTER("mysql_create_table_no_lock");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-plugins-avoid-version.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.6-plugins-avoid-version.patch 2011-05-16 15:36:26.000000000 +0200
+++ new/mysql-patches/mysql-patches/mariadb-5.2.6-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins
-
-Making all storage plugins unversioned.
-
-Maintainer: Michal Hrusecky
-
-Index: storage/blackhole/Makefile.am
-===================================================================
---- storage/blackhole/Makefile.am.orig
-+++ storage/blackhole/Makefile.am
-@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h
-
- EXTRA_LTLIBRARIES = libblackhole.la ha_blackhole.la
- pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@
--ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
-+ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
- ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_blackhole_la_SOURCES=ha_blackhole.cc
-
-Index: storage/archive/Makefile.am
-===================================================================
---- storage/archive/Makefile.am.orig
-+++ storage/archive/Makefile.am
-@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r
-
- EXTRA_LTLIBRARIES = libarchive.la ha_archive.la
- pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@
--ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir)
-+ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
- ha_archive_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_archive_la_SOURCES = ha_archive.cc azio.c
-Index: storage/example/Makefile.am
-===================================================================
---- storage/example/Makefile.am.orig
-+++ storage/example/Makefile.am
-@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h
-
- EXTRA_LTLIBRARIES = libexample.la ha_example.la
- pkgplugin_LTLIBRARIES = @plugin_example_shared_target@
--ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
-+ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
- ha_example_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_example_la_SOURCES = ha_example.cc
-
-Index: storage/federated/Makefile.am
-===================================================================
---- storage/federated/Makefile.am.orig
-+++ storage/federated/Makefile.am
-@@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h
-
- EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la ha_federated.la
- pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
--ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) \
-+ha_federated_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) \
- -L$(top_builddir)/libservices -lmysqlservices
- ha_federated_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_federated_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-Index: storage/innodb_plugin/Makefile.am
-===================================================================
---- storage/innodb_plugin/Makefile.am.orig
-+++ storage/innodb_plugin/Makefile.am
-@@ -330,7 +330,7 @@ libinnobase_la_CFLAGS= $(AM_CFLAGS)
- EXTRA_LTLIBRARIES= libinnobase.la ha_innodb_plugin.la
- pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@
-
--ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
-+ha_innodb_plugin_la_LDFLAGS= -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
- ha_innodb_plugin_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_plugin_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES)
-Index: plugin/auth/Makefile.am
-===================================================================
---- plugin/auth/Makefile.am.orig
-+++ plugin/auth/Makefile.am
-@@ -1,6 +1,6 @@
- pkgplugindir=$(pkglibdir)/plugin
-
--AM_LDFLAGS=-module -rpath $(pkgplugindir)
-+AM_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
- AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -I$(top_srcdir)/include
-
- pkgplugin_LTLIBRARIES= dialog.la
-Index: storage/federatedx/Makefile.am
-===================================================================
---- storage/federatedx/Makefile.am.orig
-+++ storage/federatedx/Makefile.am
-@@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat
-
- EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la
- pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@
--ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) \
-+ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) \
- -L$(top_builddir)/libservices -lmysqlservices
- ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-
-Index: storage/sphinx/Makefile.am
-===================================================================
---- storage/sphinx/Makefile.am.orig
-+++ storage/sphinx/Makefile.am
-@@ -33,13 +33,13 @@ noinst_HEADERS = ha_sphinx.h
- EXTRA_LTLIBRARIES = libsphinx.la ha_sphinx.la
- pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
-
--ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \
-+ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \
- -L$(top_builddir)/libservices -lmysqlservices
- ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_sphinx_la_SOURCES = ha_sphinx.cc
-
--sphinx_la_LDFLAGS = -module
-+sphinx_la_LDFLAGS = -module -avoid-version
- sphinx_la_CXXFLAGS = $(AM_CXXFLAGS)
- sphinx_la_CFLAGS = $(AM_CFLAGS)
- sphinx_la_SOURCES = snippets_udf.cc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch
--- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 2010-12-23 16:09:10.000000000 +0100
+++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-PATCH-P0-FEATURE-SUSE: Tests in $(datadir)
-
-By default tests would get installed to /usr and as we want it LSB compilant,
-we install them into /usr/share.
-
-Maintainer: Michal Hrusecky
-
-Index: mysql-test/Makefile.am
-===================================================================
---- mysql-test/Makefile.am.orig
-+++ mysql-test/Makefile.am
-@@ -17,7 +17,7 @@
-
- ## Process this file with automake to create Makefile.in
-
--testroot = $(prefix)
-+testroot = $(datadir)
- testdir = $(testroot)/mysql-test
-
- test_SCRIPTS = mtr \
-Index: mysql-test/lib/My/SafeProcess/Makefile.am
-===================================================================
---- mysql-test/lib/My/SafeProcess/Makefile.am.orig
-+++ mysql-test/lib/My/SafeProcess/Makefile.am
-@@ -13,7 +13,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
--testroot = $(prefix)
-+testroot = $(datadir)
- safedir = $(testroot)/mysql-test/lib/My/SafeProcess
- #nobase_bin_PROGRAMS = ...
- safe_PROGRAMS = my_safe_process
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/tools/apply-series.sh new/mysql-patches/tools/apply-series.sh
--- old/mysql-patches/tools/apply-series.sh 2011-05-06 17:01:22.000000000 +0200
+++ new/mysql-patches/tools/apply-series.sh 2011-10-11 12:30:00.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
##############################################################################
# #
@@ -81,5 +81,5 @@
else
echo " ! Patch \"$patch\" can't be applied !!!"
exit 3
- fi
+ fi
done < "$series"
++++++ series ++++++
--- /var/tmp/diff_new_pack.6AGShX/_old 2012-02-16 10:06:14.000000000 +0100
+++ /var/tmp/diff_new_pack.6AGShX/_new 2012-02-16 10:06:14.000000000 +0100
@@ -9,12 +9,12 @@
mysql-community-server-5.1.46-logrotate.patch
mariadb-5.1.50-strncat-overflow.patch
mariadb-5.2.6-install_db-quiet.patch
-mysql-community-server-5.1.51-myslq-test.patch
+mariadb-5.2.10-myslq-test.patch
mysql-community-server-5.1.51-mysql_config.patch
mysql-community-server-5.1.51-mysqld_multi-features.patch
-mariadb-5.2.6-plugins-avoid-version.patch
+mariadb-5.2.10-plugins-avoid-version.patch
mariadb-5.1.50-upgrade-exit-status.patch
mariadb-5.2.3-cnf.patch
mariadb-5.2.4-libmysql-no-pkglibdir.patch
mysql-community-server-5.1.53-ssl-compilation-fix.patch
-mariadb-5.2.6-compilation-fix.patch
+mariadb-5.2.10-compilation-fix.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org