Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2012-03-22 12:35:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-02-16 10:06:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2012-03-22 12:36:23.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 12 16:03:38 UTC 2012 - [email protected] + +- migrated to MariaDB 5.3.5, see: + http://kb.askmonty.org/en/what-is-mariadb-53 + http://kb.askmonty.org/en/release-notes-mariadb-53-series + http://kb.askmonty.org/en/changelogs-mariadb-53-series + +------------------------------------------------------------------- +Sat Feb 18 08:25:25 UTC 2012 - [email protected] + +- updated license to conform new policy + +------------------------------------------------------------------- Old: ---- mariadb-5.2.10.tar.bz2 New: ---- mariadb-5.3.5-ga.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.XrJsj1/_old 2012-03-22 12:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.XrJsj1/_new 2012-03-22 12:36:27.000000000 +0100 @@ -22,6 +22,8 @@ %define use_cmake 0 %define cluster 0 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb +%define use_extra_provides 1 +%define extra_provides mariadb_53 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -32,13 +34,13 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.2.10 +Version: 5.3.5 Release: 1 %define srv_vers 5.1.60 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org -Source: mariadb-%{version}.tar.bz2 +Source: mariadb-%{version}-ga.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run @@ -57,6 +59,7 @@ %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel BuildRequires: autoconf automake cmake libtool zlib-devel +BuildRequires: pam-devel %if 0%{?suse_version} BuildRequires: pwdutils tcpd-devel %endif @@ -75,6 +78,10 @@ Requires: %{name}-client perl-base Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides} = %{version} +Obsoletes: %{extra_provides} < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql < %{srv_vers} Obsoletes: mysql-Max < %{srv_vers} @@ -100,7 +107,7 @@ Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -108,7 +115,7 @@ necessary to develop client applications for MariaDB. %package -n libmysqld16 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ @@ -117,7 +124,7 @@ for developing applications that embed the MariaDB. %package -n libmysqld-devel -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files # the headers files are the shared Requires: libmysqlclient-devel = %version @@ -132,7 +139,7 @@ %package -n libmariadbclient16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient16 @@ -141,7 +148,7 @@ %package -n libmariadbclient_r16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient_r16 @@ -149,10 +156,14 @@ languages and applications need to dynamically load and use MariaDB. %package client -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Client for MariaDB Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-client = %{version} +Obsoletes: %{extra_provides}-client < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-client < %{srv_vers} %endif @@ -163,10 +174,14 @@ %package bench Requires: %{name}-client perl-DBD-mysql -License: LGPLv2.1 +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-bench = %{version} +Obsoletes: %{extra_provides}-bench < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-bench < %{srv_vers} %endif @@ -180,12 +195,16 @@ %package debug-version -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-debug-verion = %{version} +Obsoletes: %{extra_provides}-debug-version < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-debug < %{srv_vers} %endif @@ -199,7 +218,7 @@ information on how to use the debug server. %package test -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} @@ -208,6 +227,10 @@ Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-test = %{version} +Obsoletes: %{extra_provides}-test < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-test < %{srv_vers} %endif @@ -219,13 +242,17 @@ To run the testsuite, run /usr/share/mysql-test/suse-test-run. %package tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB tools Group: Productivity/Databases/Servers Requires: perl-DBD-mysql # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror Provides: mysql-tools = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-tools = %{version} +Obsoletes: %{extra_provides}-tools < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-tools < %{srv_vers} %endif @@ -237,8 +264,22 @@ %if 0%{?cluster} > 0 +%if 0%{?cluster} > 1 + +%package -n libndbclient6 +Summary: Shared Libraries for cluster client +License: SUSE-GPL-2.0-with-FLOSS-exception +Group: Development/Libraries/Other + +%description -n libndbclient6 +This package contains the shared libraries (.so) which certain +languages and applications need to dynamically load and use MariaDB +cluster. + +%endif + %package ndb-storage -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} @@ -252,7 +293,7 @@ %package ndb-management -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} @@ -265,7 +306,7 @@ one computer in the cluster. %package ndb-tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} @@ -276,7 +317,7 @@ This package contains ndbcluster storage engine basic tools. %package ndb-extra -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} @@ -289,7 +330,7 @@ %endif %prep -%setup -q -n mariadb-%{version} -D -a 9 +%setup -q -n mariadb-%{version}-ga -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . # apply patches from series @@ -377,6 +418,13 @@ %postun -n libmariadbclient_r16 -p /sbin/ldconfig +%if 0%{cluster} > 1 + +%post -n libndbclient6 -p /sbin/ldconfig + +%postun -n libndbclient6 -p /sbin/ldconfig +%endif + %if 0%{prefered} > 0 %post -n libmysqld18 -p /sbin/ldconfig @@ -440,6 +488,13 @@ %defattr(-, root, root) %{_libdir}/libmariadbclient.so.* +%if 0%{cluster} > 1 + +%files -n libndbclient6 +%defattr(-, root, root) +%{_libdir}/libndbclient.so.* +%endif + %files -n libmariadbclient_r16 %defattr(-, root, root) %{_libdir}/libmariadbclient_r.so.* ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.XrJsj1/_old 2012-03-22 12:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.XrJsj1/_new 2012-03-22 12:36:27.000000000 +0100 @@ -20,7 +20,7 @@ pushd _build$suffix ../configure \ --enable-assembler \ - --without-readline \ + --with-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.XrJsj1/_old 2012-03-22 12:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.XrJsj1/_new 2012-03-22 12:36:27.000000000 +0100 @@ -55,7 +55,7 @@ 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,index_stat,print_file,redo_log_reader,drop_table,select_all} >mysql-ndb-extra.files +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -127,6 +127,10 @@ ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%if 0%{?cluster} > 1 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6 +%endif if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf fi ++++++ 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 2011-12-07 22:01:19.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.2.10-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +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 <[email protected]> - -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)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/ndb/src/common/util/ndb_init.c -=================================================================== ---- storage/ndb/src/common/util/ndb_init.c.orig -+++ storage/ndb/src/common/util/ndb_init.c -@@ -31,7 +31,7 @@ ndb_init() - { - if (my_init()) { - const char* err = "my_init() failed - exit\n"; -- write(2, err, strlen(err)); -+ fprintf(stderr, err, strlen(err)); - exit(1); - } - ndb_init_internal(); -Index: sql/log.cc -=================================================================== ---- sql/log.cc.orig -+++ sql/log.cc -@@ -1911,7 +1911,7 @@ static void setup_windows_event_source() - - static int find_uniq_filename(char *name) - { -- long number; -+ long number=0; - uint i; - char buff[FN_REFLEN]; - struct st_my_dir *dir_info; -Index: sql/filesort.cc -=================================================================== ---- sql/filesort.cc.orig -+++ sql/filesort.cc -@@ -442,16 +442,20 @@ static void dbug_print_record(TABLE *tab - Field *field= *pfield; - - if (field->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)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/maria/ma_open.c -=================================================================== ---- storage/maria/ma_open.c.orig -+++ storage/maria/ma_open.c -@@ -1820,7 +1820,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) -@@ -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 2011-12-07 14:43:22.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.2.10-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 <[email protected]> - -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 2011-12-08 10:38:24.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.2.10-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,140 +0,0 @@ -PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins - -Making all storage plugins unversioned. - -Maintainer: Michal Hrusecky <[email protected]> - -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.3.2-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 2012-02-18 08:32:06.000000000 +0100 @@ -0,0 +1,155 @@ +PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins + +Making all storage plugins unversioned. + +Maintainer: Michal Hrusecky <[email protected]> + +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/handler_socket/handlersocket/Makefile.am +=================================================================== +--- plugin/handler_socket/handlersocket/Makefile.am.orig ++++ plugin/handler_socket/handlersocket/Makefile.am +@@ -2,7 +2,7 @@ pkgplugindir = $(PLUGIN_DIR) + CXXFLAGS += -fimplicit-templates + noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp + pkgplugin_LTLIBRARIES = handlersocket.la +-handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices ++handlersocket_la_LDFLAGS = -module -avoid-version ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices + handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient + handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ + hstcpsvr_worker.cpp hstcpsvr.cpp +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 = -avoid-version -module -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/auth_pam/Makefile.am +=================================================================== +--- plugin/auth_pam/Makefile.am.orig ++++ plugin/auth_pam/Makefile.am +@@ -4,7 +4,7 @@ pkgplugindir=$(pkglibdir)/plugin + AM_CPPFLAGS = -I$(top_srcdir)/include + + pkgplugin_LTLIBRARIES = @plugin_auth_pam_shared_target@ +-auth_pam_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam ++auth_pam_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam + auth_pam_la_CFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN + auth_pam_la_SOURCES = auth_pam.c + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 2011-12-07 17:24:30.000000000 +0100 @@ -0,0 +1,29 @@ +PATCH-P0-FIX-UPSTREAM: Fix building in different directory +BUGS: upstream#45616 + +Makes it possible to run compilation somewhere else then source code is. + +Maintainer: Michal Hrusecky <[email protected]> + +Index: scripts/Makefile.am +=================================================================== +--- scripts/Makefile.am.orig ++++ scripts/Makefile.am +@@ -120,7 +120,7 @@ mysql_fix_privilege_tables.sql: mysql_sy + @echo "-- This file is automaticly generated from" > $@ + @echo "-- mysql_system_tables.sql & mysql_system_tables_fix.sql" >> $@ + @echo "" >> $@ +- @cat mysql_system_tables.sql mysql_system_tables_fix.sql >> $@ ++ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ + + # + # Build mysql_fix_privilege_tables_sql.c from +@@ -133,7 +133,7 @@ mysql_fix_privilege_tables_sql.c: comp_s + sleep 2 + $(top_builddir)/scripts/comp_sql$(EXEEXT) \ + mysql_fix_privilege_tables \ +- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ ++ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ + + + SUFFIXES = .sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 2011-12-22 12:52:29.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 <[email protected]> + +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)<size) ++ break; + len -= (long) size; + if (size < maxs) { + break; +Index: storage/ndb/src/common/util/ndb_init.c +=================================================================== +--- storage/ndb/src/common/util/ndb_init.c.orig ++++ storage/ndb/src/common/util/ndb_init.c +@@ -31,7 +31,7 @@ ndb_init() + { + if (my_init()) { + const char* err = "my_init() failed - exit\n"; +- write(2, err, strlen(err)); ++ fprintf(stderr, err, strlen(err)); + exit(1); + } + ndb_init_internal(); +Index: sql/log.cc +=================================================================== +--- sql/log.cc.orig ++++ sql/log.cc +@@ -1936,7 +1936,7 @@ static void setup_windows_event_source() + + static int find_uniq_filename(char *name) + { +- long number; ++ long number=0; + uint i; + char buff[FN_REFLEN]; + struct st_my_dir *dir_info; +Index: sql/filesort.cc +=================================================================== +--- sql/filesort.cc.orig ++++ sql/filesort.cc +@@ -435,16 +435,20 @@ static void dbug_print_record(TABLE *tab + Field *field= *pfield; + + if (field->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 +@@ -13668,7 +13668,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 +@@ -13679,7 +13680,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)<size) ++ break; + len -= (long) size; + if (size < maxs) { + break; +Index: storage/maria/ma_open.c +=================================================================== +--- storage/maria/ma_open.c.orig ++++ storage/maria/ma_open.c +@@ -1847,7 +1847,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) +@@ -1861,12 +1860,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 +@@ -2980,7 +2980,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.3.3-myslq-test.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 2011-12-22 10:51:32.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 <[email protected]> + +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.3.3-readline-includes.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 2011-12-22 12:00:17.000000000 +0100 @@ -0,0 +1,19 @@ +PATCH-P0-HACK-UPSTREAM: Fixing readline check + +HIST_ENTRY symbol is not defined in main include, but in history.h for +readline. At least in new readline. + +Maintainer: Michal Hrusecky <[email protected]> + +Index: config/ac-macros/readline.m4 +=================================================================== +--- config/ac-macros/readline.m4.orig ++++ config/ac-macros/readline.m4 +@@ -4,6 +4,7 @@ AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_ + [ + #include "stdio.h" + #include "readline/readline.h" ++ #include "readline/history.h" + ], + [ + HIST_ENTRY entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix building in different directory -BUGS: upstream#45616 - -Makes it possible to run compilation somewhere else then source code is. - -Maintainer: Michal Hrusecky <[email protected]> - ---- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200 -+++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200 -@@ -110,7 +110,7 @@ - mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ - mysql_system_tables_fix.sql - @echo "Building $@"; -- @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ -+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ - - # - # Build mysql_fix_privilege_tables_sql.c from -@@ -123,7 +123,7 @@ - sleep 2 - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ -- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ -+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ - - - SUFFIXES = .sh ++++++ series ++++++ --- /var/tmp/diff_new_pack.XrJsj1/_old 2012-03-22 12:36:27.000000000 +0100 +++ /var/tmp/diff_new_pack.XrJsj1/_new 2012-03-22 12:36:27.000000000 +0100 @@ -1,5 +1,5 @@ mysql-community-server-5.1.31-shebang.patch -mysql-community-server-5.1.33-scripts-paths.patch +mariadb-5.3.2-scripts-paths.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch @@ -9,12 +9,13 @@ mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mariadb-5.2.10-myslq-test.patch +mariadb-5.3.3-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.10-plugins-avoid-version.patch +mariadb-5.3.2-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.10-compilation-fix.patch +mariadb-5.3.3-compilation-fix.patch +mariadb-5.3.3-readline-includes.patch -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
