- fix for big tables in 32bit arches

  even if recent versions do not emit in logs, problem is still present

Changed files:
    big_tables_fixlp284123_fixmysql35346.patch -> 1.1.2.1
    mysql.spec -> 1.353.2.91

diff --git a/big_tables_fixlp284123_fixmysql35346.patch b/big_tables_fixlp284123_fixmysql35346.patch
new file mode 100644 (file)
index 0000000..506854a
--- /dev/null
+++ b/big_tables_fixlp284123_fixmysql35346.patch
@@ -0,0 +1,31 @@
+Index: mysql-5.0.67/include/my_base.h
+===================================================================
+--- mysql-5.0.67.orig/include/my_base.h
++++ mysql-5.0.67/include/my_base.h
+@@ -41,6 +41,15 @@
+ #endif        /* stdin */
+ #include <my_list.h>
+ 
++/*
++  Clean workaround for inconsistent BIG_TABLES define issue
++  https://bugs.launchpad.net/ourdelta/+bug/284123
++  http://bugs.mysql.com/35346
++  Author: Antony Curtis, patch created by Arjen Lentz
++*/
++#undef BIG_TABLES
++#define BIG_TABLES 1
++
+ /* The following is bits in the flag parameter to ha_open() */
+ 
+ #define HA_OPEN_ABORT_IF_LOCKED               0       /* default */
+Index: mysql-5.0.67/patch_info/big_tables_fixlp284123_fixmysql35346.info
+===================================================================
+--- /dev/null
++++ mysql-5.0.67/patch_info/big_tables_fixlp284123_fixmysql35346.info
+@@ -0,0 +1,6 @@
++File=big_tables_fixlp284123_fixmysql35346.patch
++Name=Fix for http://bugs.mysql.com/35346 (BIG_TABLES define)
++Version=1.0
++Author=Antony Curtis <atcurtis@mac.com>
++License=N/A
++Comment=Patch created by Arjen Lentz <arjen@openquery.com>

diff --git a/mysql.spec b/mysql.spec
index e75f600be2781a282e945561919d46934f965041..4f17ce4ccccadcd512a22089fc8cd9529f72e21b 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,7 +25,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.0.90
-Release:       1
+Release:       2
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0:      ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
@@ -69,6 +69,8 @@ Patch18:      %{name}-xtrabackup.patch
 Patch19:       %{name}-fixes.patch
 Patch21:       %{name}-atomic.patch
 Patch22:       %{name}-fix-dummy-thread-race-condition.patch
+# ourdelta
+Patch23:       big_tables_fixlp284123_fixmysql35346.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-show_patches.patch
 Patch101:      %{name}-microslow_innodb.patch
@@ -562,6 +564,7 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch19 -p1
 %patch21 -p0
 %patch22 -p1
+%patch23 -p1
 
 %build
 %{__libtoolize}