Skip to content

M
MariaDB
Commit d0408492 authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files
Options

Merge "trunk-build" (including 5.4.2-beta) and "trunk".

parents 68fd9874 55eb4962
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 30 deletions
mysql-test/mysql-test-run.pl
View file @ d0408492
...@@ -1781,6 +1781,14 @@ sub environment_setup { ...@@ -1781,6 +1781,14 @@ sub environment_setup {
$ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'"; $ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'";
$ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=;EXAMPLE=".$plugin_filename.";"; $ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=;EXAMPLE=".$plugin_filename.";";
} }
else
{
# Some ".opt" files use some of these variables, so they must be defined
$ENV{'EXAMPLE_PLUGIN'}= "";
$ENV{'EXAMPLE_PLUGIN_OPT'}= "";
$ENV{'HA_EXAMPLE_SO'}= "";
$ENV{'EXAMPLE_PLUGIN_LOAD'}= "";
}
# ---------------------------------------------------- # ----------------------------------------------------
# Add the path where mysqld will find mypluglib.so # Add the path where mysqld will find mypluglib.so
......
scripts/Makefile.am
View file @ d0408492
...@@ -169,7 +169,6 @@ SUFFIXES = .sh ...@@ -169,7 +169,6 @@ SUFFIXES = .sh
-e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
-e 's!@''LIBS''@!@LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \ -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
-e 's!@''openssl_libs''@!@openssl_libs@!' \ -e 's!@''openssl_libs''@!@openssl_libs@!' \
-e 's!@''VERSION''@!@VERSION@!' \ -e 's!@''VERSION''@!@VERSION@!' \
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \ -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
......
scripts/mysql_config.pl.in
View file @ d0408492
...@@ -202,7 +202,7 @@ $flags->{libs} = ...@@ -202,7 +202,7 @@ $flags->{libs} =
$flags->{libs_r} = $flags->{libs_r} =
[@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@']; [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@'];
$flags->{embedded_libs} = $flags->{embedded_libs} =
[@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@']; [@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@openssl_libs@'];
$flags->{include} = ["-I$pkgincludedir"]; $flags->{include} = ["-I$pkgincludedir"];
$flags->{cflags} = [@{$flags->{include}},split(" ",'@CFLAGS@')]; $flags->{cflags} = [@{$flags->{include}},split(" ",'@CFLAGS@')];
......
scripts/mysql_config.sh
View file @ d0408492
...@@ -107,7 +107,7 @@ fi ...@@ -107,7 +107,7 @@ fi
libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
if [ -r "$pkglibdir/libmygcc.a" ]; then if [ -r "$pkglibdir/libmygcc.a" ]; then
# When linking against the static library with a different version of GCC # When linking against the static library with a different version of GCC
......
storage/innobase/handler/i_s.cc
View file @ d0408492
...@@ -69,14 +69,16 @@ do { \ ...@@ -69,14 +69,16 @@ do { \
#define STRUCT_FLD(name, value) value #define STRUCT_FLD(name, value) value
#endif #endif
static const ST_FIELD_INFO END_OF_ST_FIELD_INFO = /* Don't use a static const variable here, as some C++ compilers (notably
{STRUCT_FLD(field_name, NULL), HPUX aCC: HP ANSI C++ B3910B A.03.65) can't handle it. */
STRUCT_FLD(field_length, 0), #define END_OF_ST_FIELD_INFO \
STRUCT_FLD(field_type, MYSQL_TYPE_NULL), {STRUCT_FLD(field_name, NULL), \
STRUCT_FLD(value, 0), STRUCT_FLD(field_length, 0), \
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_type, MYSQL_TYPE_NULL), \
STRUCT_FLD(old_name, ""), STRUCT_FLD(value, 0), \
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}; STRUCT_FLD(field_flags, 0), \
STRUCT_FLD(old_name, ""), \
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}
/* /*
Use the following types mapping: Use the following types mapping:
......
storage/innobase/include/univ.i
View file @ d0408492
...@@ -408,7 +408,8 @@ it is read. */ ...@@ -408,7 +408,8 @@ it is read. */
/* Minimize cache-miss latency by moving data at addr into a cache before /* Minimize cache-miss latency by moving data at addr into a cache before
it is read or written. */ it is read or written. */
# define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3) # define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3)
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) /* Sun Studio includes sun_prefetch.h as of version 5.9 */
#elif (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
# include <sun_prefetch.h> # include <sun_prefetch.h>
#if __SUNPRO_C >= 0x550 #if __SUNPRO_C >= 0x550
# undef UNIV_INTERN # undef UNIV_INTERN
......
support-files/mysql.spec.sh
View file @ d0408492
...@@ -465,11 +465,9 @@ rm -fr $RBR%{_datadir}/sql-bench ...@@ -465,11 +465,9 @@ rm -fr $RBR%{_datadir}/sql-bench
# will appreciate that, as all services usually offer this. # will appreciate that, as all services usually offer this.
ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
# Touch the place where the my.cnf config file and mysqlmanager.passwd # Touch the place where the my.cnf config file might be located
# (MySQL Instance Manager password file) might be located
# Just to make sure it's in the file list and marked as a config file # Just to make sure it's in the file list and marked as a config file
touch $RBR%{_sysconfdir}/my.cnf touch $RBR%{_sysconfdir}/my.cnf
touch $RBR%{_sysconfdir}/mysqlmanager.passwd
%pre server %pre server
# Check if we can safely upgrade. An upgrade is only safe if it's from one # Check if we can safely upgrade. An upgrade is only safe if it's from one
...@@ -667,7 +665,6 @@ fi ...@@ -667,7 +665,6 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
%doc %attr(644, root, man) %{_mandir}/man8/mysqlmanager.8*
%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
...@@ -677,7 +674,6 @@ fi ...@@ -677,7 +674,6 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/replace.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
%attr(755, root, root) %{_bindir}/innochecksum %attr(755, root, root) %{_bindir}/innochecksum
%attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/my_print_defaults
...@@ -709,7 +705,6 @@ fi ...@@ -709,7 +705,6 @@ fi
%attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld
%attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/mysqld-debug
%attr(755, root, root) %{_sbindir}/mysqlmanager
%attr(755, root, root) %{_sbindir}/rcmysql %attr(755, root, root) %{_sbindir}/rcmysql
%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
...@@ -865,8 +860,13 @@ fi ...@@ -865,8 +860,13 @@ fi
%changelog %changelog
* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com> * Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
- Merge up form 5.1 to 5.4: Remove handling for the InnoDB plugin. - Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
- This version does not contain the "Instance manager", "mysqlmanager":
Remove it from the spec file so that packaging succeeds.
* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com> * Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
- Add conditionals for bundled zlib and innodb plugin - Add conditionals for bundled zlib and innodb plugin
...@@ -884,7 +884,7 @@ fi ...@@ -884,7 +884,7 @@ fi
- Correct yesterday's fix, so that it also works for the last flag, - Correct yesterday's fix, so that it also works for the last flag,
and fix a wrong quoting: un-quoted quote marks must not be escaped. and fix a wrong quoting: un-quoted quote marks must not be escaped.
* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com> * Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
- Removed "mysql_upgrade_shell" - Removed "mysql_upgrade_shell"
...@@ -894,7 +894,7 @@ fi ...@@ -894,7 +894,7 @@ fi
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
This should cover both gcc and icc flags. Fixes bug#40546. This should cover both gcc and icc flags. Fixes bug#40546.
* Fri Aug 29 2008 Kent Boortz <kent@mysql.com> * Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
- Removed the "Federated" storage engine option, and enabled in all - Removed the "Federated" storage engine option, and enabled in all
...@@ -929,7 +929,7 @@ fi ...@@ -929,7 +929,7 @@ fi
* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com> * Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
- "ndb_size.tmpl" is not needed any more, - "ndb_size.tmpl" is not needed any more,
"man1/mysql_install_db.1" lacked the trailing '*'. "man1/mysql_install_db.1" lacked the trailing '*'.
* Sat Apr 07 2007 Kent Boortz <kent@mysql.com> * Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
...@@ -968,12 +968,12 @@ fi ...@@ -968,12 +968,12 @@ fi
* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com> * Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
- Call "make install" using "benchdir_root=%{_datadir}", - Call "make install" using "benchdir_root=%{_datadir}",
because that is affecting the regression test suite as well. because that is affecting the regression test suite as well.
* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com> * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) - Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
(bug#22081). (bug#22081).
...@@ -1089,8 +1089,8 @@ fi ...@@ -1089,8 +1089,8 @@ fi
* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com> * Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
- Avoid using the "bundled" zlib on "shared" builds: - Avoid using the "bundled" zlib on "shared" builds:
As it is not installed (on the build system), this gives dependency As it is not installed (on the build system), this gives dependency
problems with "libtool" causing the build to fail. problems with "libtool" causing the build to fail.
(Change was done on Nov 11, but left uncommented.) (Change was done on Nov 11, but left uncommented.)
...@@ -1280,7 +1280,7 @@ fi ...@@ -1280,7 +1280,7 @@ fi
* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com> * Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
- when using gcc, _always_ use CXX=gcc - when using gcc, _always_ use CXX=gcc
- replaced Copyright with License field (Copyright is obsolete) - replaced Copyright with License field (Copyright is obsolete)
* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com> * Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
...@@ -1370,7 +1370,7 @@ fi ...@@ -1370,7 +1370,7 @@ fi
* Wed Nov 27 2002 Lenz Grimmer <lenz@mysql.com> * Wed Nov 27 2002 Lenz Grimmer <lenz@mysql.com>
- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of - moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of
Linux distributions now support this scheme as proposed by the LSB either Linux distributions now support this scheme as proposed by the LSB either
directly or via a compatibility symlink) directly or via a compatibility symlink)
- Use new "restart" init script action instead of starting and stopping - Use new "restart" init script action instead of starting and stopping
...@@ -1385,7 +1385,7 @@ fi ...@@ -1385,7 +1385,7 @@ fi
(mixing 3.23 and 4.0 packages) (mixing 3.23 and 4.0 packages)
* Fri Aug 09 2002 Lenz Grimmer <lenz@mysql.com> * Fri Aug 09 2002 Lenz Grimmer <lenz@mysql.com>
- Turn off OpenSSL in MySQL-Max for now until it works properly again - Turn off OpenSSL in MySQL-Max for now until it works properly again
- enable RAID for the Max binary instead - enable RAID for the Max binary instead
- added compatibility link: safe_mysqld -> mysqld_safe to ease the - added compatibility link: safe_mysqld -> mysqld_safe to ease the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7