- up to 5.0.83

Changed files:
    mysql-innodb_io_patches.patch -> 1.1.2.3
    mysql-userstatv2.patch -> 1.1.2.8
    mysql.spec -> 1.353.2.68

diff --git a/mysql-innodb_io_patches.patch b/mysql-innodb_io_patches.patch
index 0b3ccef0c589df34819b22a380bcc87b1267338c..2677ed4545e2c500bd62c34236a31257cd7b29d9 100644 (file)
--- a/mysql-innodb_io_patches.patch
+++ b/mysql-innodb_io_patches.patch
@@ -465,9 +465,9 @@ diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
  extern long innobase_open_files;
  extern char *innobase_data_home_dir, *innobase_data_file_path;
 @@ -234,6 +235,13 @@
- extern ulong srv_thread_concurrency;
- extern ulong srv_commit_concurrency;
- extern ulong srv_flush_log_at_trx_commit;
+ running with the fix disabled because MySQL 5.1 is frozen for such
+ behavioral changes. */
+ extern char srv_use_legacy_cardinality_algorithm;
 +extern ulong srv_io_capacity;
 +extern long long srv_ibuf_max_size;
 +extern ulong srv_ibuf_active_contract;
@@ -617,9 +617,9 @@ diff -ruN a/sql/set_var.cc b/sql/set_var.cc
    &sys_trust_routine_creators,
    &sys_trust_function_creators,
 @@ -982,6 +1000,15 @@
-   {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},
-   {sys_innodb_thread_concurrency.name, (char*) &sys_innodb_thread_concurrency, SHOW_SYS},
    {sys_innodb_thread_sleep_delay.name, (char*) &sys_innodb_thread_sleep_delay, SHOW_SYS},
+   {sys_innodb_use_legacy_cardinality_algorithm.name,
+    (char*) &sys_innodb_use_legacy_cardinality_algorithm, SHOW_SYS},
 +  {sys_innodb_io_capacity.name, (char*) &sys_innodb_io_capacity, SHOW_SYS},
 +  {"innodb_ibuf_max_size", (char*) &srv_ibuf_max_size, SHOW_LONGLONG},
 +  {sys_innodb_ibuf_active_contract.name, (char*) &sys_innodb_ibuf_active_contract, SHOW_SYS},

diff --git a/mysql-userstatv2.patch b/mysql-userstatv2.patch
index 649ccd3f17ffcc90cadbda850bc2971d8c4b0558..f817c0453fc0bea58e3907771e6ae28ef792e6a8 100644 (file)
--- a/mysql-userstatv2.patch
+++ b/mysql-userstatv2.patch
@@ -42,51 +42,6 @@ diff -r 23e5576aa59a SSL/Makefile.in
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 23e5576aa59a aclocal.m4
---- a/aclocal.m4       Tue Feb 17 22:33:00 2009 -0800
-+++ b/aclocal.m4       Tue Feb 17 22:33:23 2009 -0800
-@@ -4412,6 +4412,9 @@
- # Is the compiler the GNU C compiler?
- with_gcc=$_LT_AC_TAGVAR(GCC, $1)
- 
-+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-+gcc_ver=\`gcc -dumpversion\`
-+
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -4545,11 +4548,11 @@
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -4561,7 +4564,7 @@
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -4641,7 +4644,7 @@
- link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 diff -r 23e5576aa59a client/Makefile.in
 --- a/client/Makefile.in       Tue Feb 17 22:33:00 2009 -0800
 +++ b/client/Makefile.in       Tue Feb 17 22:33:23 2009 -0800

diff --git a/mysql.spec b/mysql.spec
index 6a147beb5b43e11e7810500a35e8d8627c1f1698..df890410da618e379c0e233603dd8e56e3ec42da 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,13 +25,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.0.81
+Version:       5.0.83
 Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0:      ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
 Source0:       http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
-# Source0-md5: 2d35e4980f279c839172a6efdb0f0b15
+# Source0-md5: 051392064a1e32cca5c23a593908b10e
 #Source0:      http://mysql.he.net/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
 #Source0:      http://mirror.provenscaling.com/mysql/enterprise/source/5.0/%{name}-%{version}.tar.gz
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.9-rc1.tar.gz