Wed Jan 14 17:10:36 UTC 2009

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18524

Modified Files:
	.cvsignore mysql-errno.patch mysql-install-test.patch 
	mysql-stack-guard.patch mysql-stack.patch mysql-testing.patch 
	mysql.spec sources 
Added Files:
	mysql-bogus-ssl-test.patch mysql-embedded-check.c 
	mysql-plugin-bug.patch mysql-ssl-multilib.patch 
Removed Files:
	mysql-bdb-link.patch mysql-bdb-open.patch mysql-libdir.patch 
	mysql-no-atomic.patch mysql-no-dbug.patch mysql-rpl-test.patch 
	mysql-rpl_ddl.patch 
Log Message:
Update to MySQL 5.1.30

mysql-bogus-ssl-test.patch:

--- NEW FILE mysql-bogus-ssl-test.patch ---
AFAICT this test is simply guaranteed to fail if run with SSL connections
enabled.  Remove the part that depends on the SSL connection history.


diff -Naur mysql-5.1.30.orig/mysql-test/r/openssl_1.result mysql-5.1.30/mysql-test/r/openssl_1.result
--- mysql-5.1.30.orig/mysql-test/r/openssl_1.result	2008-11-14 12:30:53.000000000 -0500
+++ mysql-5.1.30/mysql-test/r/openssl_1.result	2009-01-13 12:57:01.000000000 -0500
@@ -68,12 +68,10 @@
 CREATE TABLE thread_status
 SELECT variable_name, variable_value
 FROM information_schema.session_status
-WHERE variable_name LIKE 'SSL_ACCEPTS' OR
-variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
 END$$
 SELECT variable_name, variable_value FROM thread_status;
 variable_name	variable_value
-SSL_ACCEPTS	0
 SSL_CALLBACK_CACHE_HITS	0
 DROP TABLE thread_status;
 SET GLOBAL event_scheduler=0;
diff -Naur mysql-5.1.30.orig/mysql-test/t/openssl_1.test mysql-5.1.30/mysql-test/t/openssl_1.test
--- mysql-5.1.30.orig/mysql-test/t/openssl_1.test	2008-11-14 12:30:15.000000000 -0500
+++ mysql-5.1.30/mysql-test/t/openssl_1.test	2009-01-13 12:56:42.000000000 -0500
@@ -136,8 +136,7 @@
   CREATE TABLE thread_status
   SELECT variable_name, variable_value
   FROM information_schema.session_status
-  WHERE variable_name LIKE 'SSL_ACCEPTS' OR
-  variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+  WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
 END$$
 
 DELIMITER ;$$


--- NEW FILE mysql-embedded-check.c ---
/* simple test program to see if we can link the embedded server library */

#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>

#include "mysql.h"

MYSQL *mysql;

static char *server_options[] = \
       { "mysql_test", "--defaults-file=my.cnf", NULL };
int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;

static char *server_groups[] = { "libmysqld_server", 
                                 "libmysqld_client", NULL };

int main(int argc, char **argv)
{
   mysql_library_init(num_elements, server_options, server_groups);
   mysql = mysql_init(NULL);
   mysql_close(mysql);
   mysql_library_end();

   return 0;
}

mysql-plugin-bug.patch:

--- NEW FILE mysql-plugin-bug.patch ---
The plugins stuff has got obscure problems on PPC64 ... figure it out
another day ...


diff -Naur mysql-5.1.30.orig/mysql-test/t/disabled.def mysql-5.1.30/mysql-test/t/disabled.def
--- mysql-5.1.30.orig/mysql-test/t/disabled.def	2008-11-14 12:30:00.000000000 -0500
+++ mysql-5.1.30/mysql-test/t/disabled.def	2009-01-14 01:15:24.000000000 -0500
@@ -15,3 +15,5 @@
 log_tables.test                       : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
 slow_query_log_func.test              : Bug #37962: *_func tests containing sleeps/race conditions
 events-bugs.test                      : Bug #39848, Bug #39863, Bug #39569, Bug #37774
+#
+plugin_load     : gives wrong answer on PPC64

mysql-ssl-multilib.patch:

--- NEW FILE mysql-ssl-multilib.patch ---
We can do without -L/usr/lib/, especially in 64-bit builds ...


diff -Naur mysql-5.1.30.orig/config/ac-macros/ssl.m4 mysql-5.1.30/config/ac-macros/ssl.m4
--- mysql-5.1.30.orig/config/ac-macros/ssl.m4	2008-11-14 11:34:23.000000000 -0500
+++ mysql-5.1.30/config/ac-macros/ssl.m4	2009-01-13 19:17:09.000000000 -0500
@@ -102,7 +102,12 @@
   #
   # Try to link with openSSL libs in <location>
   #
-  openssl_libs="-L$location/lib/ -lssl -lcrypto"
+  if test "$location" != "/usr"
+  then
+    openssl_libs="-L$location/lib/ -lssl -lcrypto"
+  else
+    openssl_libs="-lssl -lcrypto"
+  fi
   MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
 
   if test "$mysql_ssl_found" == "no"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	23 Aug 2008 20:31:19 -0000	1.33
+++ .cvsignore	14 Jan 2009 17:10:05 -0000	1.34
@@ -1 +1 @@
-mysql-5.0.67.tar.gz
+mysql-5.1.30.tar.gz

mysql-errno.patch:

Index: mysql-errno.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-errno.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-errno.patch	23 Aug 2008 20:31:19 -0000	1.4
+++ mysql-errno.patch	14 Jan 2009 17:10:05 -0000	1.5
@@ -1,12 +1,12 @@
 "extern int errno" is just a really bad idea.
 
 
-diff -Naur mysql-5.0.67.orig/include/my_sys.h mysql-5.0.67/include/my_sys.h
---- mysql-5.0.67.orig/include/my_sys.h	2008-08-04 08:19:12.000000000 -0400
-+++ mysql-5.0.67/include/my_sys.h	2008-08-23 14:39:08.000000000 -0400
-@@ -208,13 +208,8 @@
- #endif
- #endif /* MSDOS */
+diff -Naur mysql-5.1.30.orig/include/my_sys.h mysql-5.1.30/include/my_sys.h
+--- mysql-5.1.30.orig/include/my_sys.h	2008-11-14 11:34:35.000000000 -0500
++++ mysql-5.1.30/include/my_sys.h	2009-01-13 11:04:15.000000000 -0500
+@@ -201,13 +201,8 @@
+ #define my_afree(PTR) my_free(PTR,MYF(MY_WME))
+ #endif /* HAVE_ALLOCA */
  
 -#ifndef errno				/* did we already get it? */
 -#ifdef HAVE_ERRNO_AS_DEFINE

mysql-install-test.patch:

Index: mysql-install-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql-install-test.patch	23 Aug 2008 20:31:19 -0000	1.6
+++ mysql-install-test.patch	14 Jan 2009 17:10:05 -0000	1.7
@@ -4,9 +4,9 @@
 This patch also improves the documentation a tad.
 
 
-diff -Naur mysql-5.0.67.orig/mysql-test/README mysql-5.0.67/mysql-test/README
---- mysql-5.0.67.orig/mysql-test/README	2008-08-04 08:19:20.000000000 -0400
-+++ mysql-5.0.67/mysql-test/README	2008-08-23 16:25:14.000000000 -0400
+diff -Naur mysql-5.1.30.orig/mysql-test/README mysql-5.1.30/mysql-test/README
+--- mysql-5.1.30.orig/mysql-test/README	2008-11-14 11:34:38.000000000 -0500
++++ mysql-5.1.30/mysql-test/README	2009-01-13 11:30:00.000000000 -0500
 @@ -6,6 +6,19 @@
  actually have a co-existing MySQL installation. The tests will not
  conflict with it.
@@ -37,9 +37,9 @@
  
  
  You can create your own test cases. To create a test case, create a new
-diff -Naur mysql-5.0.67.orig/mysql-test/install_test_db.sh mysql-5.0.67/mysql-test/install_test_db.sh
---- mysql-5.0.67.orig/mysql-test/install_test_db.sh	2008-08-04 08:19:21.000000000 -0400
-+++ mysql-5.0.67/mysql-test/install_test_db.sh	2008-08-23 16:21:59.000000000 -0400
+diff -Naur mysql-5.1.30.orig/mysql-test/install_test_db.sh mysql-5.1.30/mysql-test/install_test_db.sh
+--- mysql-5.1.30.orig/mysql-test/install_test_db.sh	2008-11-14 11:34:47.000000000 -0500
++++ mysql-5.1.30/mysql-test/install_test_db.sh	2009-01-13 11:30:00.000000000 -0500
 @@ -26,18 +26,15 @@
    libexecdir=../libexec
  
@@ -65,7 +65,7 @@
    fix_bin=mysql-test
  else
    execdir=../sql
-@@ -97,7 +94,8 @@
+@@ -96,7 +93,8 @@
  
  #for error messages
  if [ x$BINARY_DIST = x1 ] ; then

mysql-stack-guard.patch:

Index: mysql-stack-guard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack-guard.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-stack-guard.patch	4 Mar 2008 00:44:31 -0000	1.3
+++ mysql-stack-guard.patch	14 Jan 2009 17:10:05 -0000	1.4
@@ -8,13 +8,13 @@
 Filed upstream at http://bugs.mysql.com/bug.php?id=35019
 
 
-diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
---- mysql-5.0.45.orig/sql/mysqld.cc	2007-07-04 09:06:03.000000000 -0400
-+++ mysql-5.0.45/sql/mysqld.cc	2008-03-03 17:16:25.000000000 -0500
-@@ -2281,6 +2281,68 @@
-   DBUG_VOID_RETURN;
+diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
+--- mysql-5.1.30.orig/sql/mysqld.cc	2008-11-14 11:37:13.000000000 -0500
++++ mysql-5.1.30/sql/mysqld.cc	2009-01-13 12:08:35.000000000 -0500
+@@ -2602,6 +2602,70 @@
  }
  
+ 
 +/* pthread_attr_setstacksize without so much platform-dependency */
 +/* returns the actual stack size if possible */
 +static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize)
@@ -77,10 +77,12 @@
 +#endif
 +  return stacksize;
 +}
- 
++
++
  static void start_signal_handler(void)
  {
-@@ -2294,15 +2356,7 @@
+   int error;
+@@ -2614,15 +2678,7 @@
    (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
    if (!(opt_specialflag & SPECIAL_NO_PRIOR))
      my_pthread_attr_setprio(&thr_attr,INTERRUPT_PRIOR);
@@ -89,15 +91,15 @@
 -    Peculiar things with ia64 platforms - it seems we only have half the
 -    stack size in reality, so we have to double it here
 -  */
--  pthread_attr_setstacksize(&thr_attr,thread_stack*2);
+-  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size*2);
 -#else
--  pthread_attr_setstacksize(&thr_attr,thread_stack);
+-  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size);
 -#endif
-+  (void) my_setstacksize(&thr_attr,thread_stack);
++  (void) my_setstacksize(&thr_attr,my_thread_stack_size);
  #endif
  
    (void) pthread_mutex_lock(&LOCK_thread_count);
-@@ -3499,41 +3553,12 @@
+@@ -4176,40 +4232,12 @@
    init_signals();
    if (!(opt_specialflag & SPECIAL_NO_PRIOR))
      my_pthread_setprio(pthread_self(),CONNECT_PRIOR);
@@ -106,9 +108,9 @@
 -    Peculiar things with ia64 platforms - it seems we only have half the
 -    stack size in reality, so we have to double it here
 -  */
--  pthread_attr_setstacksize(&connection_attrib,thread_stack*2);
+-  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size*2);
 -#else
--  pthread_attr_setstacksize(&connection_attrib,thread_stack);
+-  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size);
 -#endif
 -#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
 -  {
@@ -119,15 +121,15 @@
 -    stack_size/= 2;
 -#endif
 -    /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
--    if (stack_size && stack_size < thread_stack)
+-    if (stack_size && stack_size < my_thread_stack_size)
 -    {
 -      if (global_system_variables.log_warnings)
 -	sql_print_warning("Asked for %lu thread stack, but got %ld",
--			  thread_stack, (long) stack_size);
+-			  my_thread_stack_size, (long) stack_size);
 -#if defined(__ia64__) || defined(__ia64)
--      thread_stack= stack_size*2;
+-      my_thread_stack_size= stack_size*2;
 -#else
--      thread_stack= stack_size;
+-      my_thread_stack_size= stack_size;
 -#endif
 -    }
 -  }
@@ -135,10 +137,9 @@
 +
  #ifdef __NETWARE__
    /* Increasing stacksize of threads on NetWare */
--
    pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
 +#else
-+  thread_stack = my_setstacksize(&connection_attrib,thread_stack);
++  my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
  #endif
  
    (void) thr_setconcurrency(concurrency);	// 10 by default

mysql-stack.patch:

Index: mysql-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql-stack.patch	28 Feb 2008 21:23:49 -0000	1.11
+++ mysql-stack.patch	14 Jan 2009 17:10:05 -0000	1.12
@@ -9,15 +9,15 @@
 further without increasing the latter as well.
 
 
-diff -Naur mysql-5.0.45.orig/sql/mysql_priv.h mysql-5.0.45/sql/mysql_priv.h
---- mysql-5.0.45.orig/sql/mysql_priv.h	2007-07-04 09:06:41.000000000 -0400
-+++ mysql-5.0.45/sql/mysql_priv.h	2008-01-08 17:32:22.000000000 -0500
-@@ -173,7 +173,7 @@
+diff -Naur mysql-5.1.30.orig/sql/mysql_priv.h mysql-5.1.30/sql/mysql_priv.h
+--- mysql-5.1.30.orig/sql/mysql_priv.h	2008-11-14 11:37:13.000000000 -0500
++++ mysql-5.1.30/sql/mysql_priv.h	2009-01-13 11:07:35.000000000 -0500
+@@ -286,7 +286,7 @@
   Feel free to raise this by the smallest amount you can to get the
   "execution_constants" test to pass.
   */
--#define STACK_MIN_SIZE          12000   // Abort if less stack during eval.
-+#define STACK_MIN_SIZE          16384   // Abort if less stack during eval.
+-#define STACK_MIN_SIZE          12000   ///< Abort if less stack during eval.
++#define STACK_MIN_SIZE          16384   ///< Abort if less stack during eval.
  
  #define STACK_MIN_SIZE_FOR_OPEN 1024*80
- #define STACK_BUFF_ALLOC        352     // For stack overrun checks
+ #define STACK_BUFF_ALLOC        352     ///< For stack overrun checks

mysql-testing.patch:

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql-testing.patch	23 Aug 2008 20:31:19 -0000	1.11
+++ mysql-testing.patch	14 Jan 2009 17:10:05 -0000	1.12
@@ -5,30 +5,22 @@
 from the calling terminal session.  Without this, the ssl_des test hangs up
 because OpenSSL tries to read a PEM key from /dev/tty.
 
-Also, tweak the Perl test script to find some files where we install them;
-without this, the build-time test works but the mysql-test RPM doesn't.
 
-
-diff -Naur mysql-5.0.67.orig/Makefile.am mysql-5.0.67/Makefile.am
---- mysql-5.0.67.orig/Makefile.am	2008-08-04 08:18:47.000000000 -0400
-+++ mysql-5.0.67/Makefile.am	2008-08-23 13:49:56.000000000 -0400
-@@ -127,11 +127,11 @@
- 
- test-ps:
- 	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol
+diff -Naur mysql-5.1.30.orig/Makefile.am mysql-5.1.30/Makefile.am
+--- mysql-5.1.30.orig/Makefile.am	2008-11-14 11:34:15.000000000 -0500
++++ mysql-5.1.30/Makefile.am	2009-01-13 11:13:12.000000000 -0500
+@@ -98,7 +98,7 @@
  
  test-ns:
  	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem)
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl
- 
- test:	test-ns test-ps
+-	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
  
-diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-test/lib/mtr_process.pl
---- mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl	2008-08-04 08:32:17.000000000 -0400
-+++ mysql-5.0.67/mysql-test/lib/mtr_process.pl	2008-08-23 13:48:23.000000000 -0400
+ test-binlog-statement:
+ 	cd mysql-test ; \
+diff -Naur mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl mysql-5.1.30/mysql-test/lib/mtr_process.pl
+--- mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl	2008-11-14 12:31:10.000000000 -0500
++++ mysql-5.1.30/mysql-test/lib/mtr_process.pl	2009-01-13 11:14:25.000000000 -0500
 @@ -150,6 +150,9 @@
      {
        # Child, redirect output and exec
@@ -39,38 +31,10 @@
        $SIG{INT}= 'DEFAULT';         # Parent do some stuff, we don't
  
        my $log_file_open_mode = '>';
-diff -Naur mysql-5.0.67.orig/mysql-test/mysql-test-run.pl mysql-5.0.67/mysql-test/mysql-test-run.pl
---- mysql-5.0.67.orig/mysql-test/mysql-test-run.pl	2008-08-04 08:19:21.000000000 -0400
-+++ mysql-5.0.67/mysql-test/mysql-test-run.pl	2008-08-23 13:48:23.000000000 -0400
-@@ -1510,13 +1510,15 @@
- 
-   $exe_ndbd=
-     mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
--			 "$ndb_path/ndbd");
-+			 "$ndb_path/ndbd",
-+    			 "/usr/libexec/ndbd");
-   $exe_ndb_mgm=
-     mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
- 			 "$ndb_path/ndb_mgm");
-   $exe_ndb_mgmd=
-     mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
--			 "$ndb_path/ndb_mgmd");
-+			 "$ndb_path/ndb_mgmd",
-+			 "/usr/libexec/ndb_mgmd");
-   $exe_ndb_waiter=
-     mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
- 			 "$ndb_path/ndb_waiter");
-@@ -1617,7 +1619,8 @@
-     # Look for mysql_fix_privilege_tables.sql script
-     $file_mysql_fix_privilege_tables=
-       mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
--		      "$glob_basedir/share/mysql_fix_privilege_tables.sql");
-+		      "$glob_basedir/share/mysql_fix_privilege_tables.sql",
-+		      "$path_share/mysql_fix_privilege_tables.sql");
- 
-     if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) {
-       mtr_warning("Could not find all required ndb binaries, " .
-@@ -4094,7 +4097,7 @@
+diff -Naur mysql-5.1.30.orig/mysql-test/mysql-test-run.pl mysql-5.1.30/mysql-test/mysql-test-run.pl
+--- mysql-5.1.30.orig/mysql-test/mysql-test-run.pl	2008-11-14 11:34:48.000000000 -0500
++++ mysql-5.1.30/mysql-test/mysql-test-run.pl	2009-01-13 11:17:52.000000000 -0500
+@@ -4204,7 +4204,7 @@
  
    if ( defined $exe )
    {


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mysql.spec	1 Oct 2008 23:17:59 -0000	1.109
+++ mysql.spec	14 Jan 2009 17:10:05 -0000	1.110
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.67
-Release: 2%{?dist}
+Version: 5.1.30
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -11,7 +11,7 @@
 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest:%define runselftest 1}
 
-Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz
+Source0: http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source3: my.cnf
 Source4: scriptstub.c
@@ -19,20 +19,18 @@
 Source6: ndbd.init
 Source7: ndb_mgmd.init
 Source8: ndb_types.h
+Source9: mysql-embedded-check.c
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh 
-Patch1: mysql-libdir.patch
+Source999: filter-requires-mysql.sh
+
+Patch1: mysql-ssl-multilib.patch
 Patch2: mysql-errno.patch
 Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
-Patch5: mysql-no-atomic.patch
-Patch6: mysql-rpl_ddl.patch
-Patch7: mysql-rpl-test.patch
-Patch8: mysql-install-test.patch
-Patch9: mysql-bdb-link.patch
-Patch10: mysql-bdb-open.patch
-Patch13: mysql-no-dbug.patch
-Patch15: mysql-stack-guard.patch
+Patch5: mysql-install-test.patch
+Patch6: mysql-stack-guard.patch
+Patch7: mysql-bogus-ssl-test.patch
+Patch8: mysql-plugin-bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -43,7 +41,7 @@
 # Socket is needed to run regression tests
 BuildRequires: perl(Socket)
 
-Prereq: /sbin/install-info, grep, fileutils
+Requires: /sbin/install-info, grep, fileutils
 Requires: %{name}-libs = %{version}-%{release}
 Requires: bash
 Conflicts: MySQL
@@ -62,7 +60,7 @@
 
 Summary: The shared libraries required for MySQL clients
 Group: Applications/Databases
-Prereq: /sbin/ldconfig
+Requires: /sbin/ldconfig
 
 %description libs
 The mysql-libs package provides the essential shared libraries for any 
@@ -74,7 +72,7 @@
 
 Summary: The MySQL server and related files
 Group: Applications/Databases
-Prereq: /sbin/chkconfig, /usr/sbin/useradd
+Requires: /sbin/chkconfig, /usr/sbin/useradd
 Requires: %{name} = %{version}-%{release}
 Requires: sh-utils
 # mysqlhotcopy needs DBI/DBD support
@@ -174,10 +172,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch13 -p1
-%patch15 -p1
 
 libtoolize --force
 aclocal
@@ -192,12 +186,15 @@
 CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
 # force PIC mode so that we can build libmysqld.so
 CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
+# extra C++ flags as per recommendations in mysql's INSTALL-SOURCE doc
+CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
 export CFLAGS CXXFLAGS
 
+# mysql 5.1.30 fails regression tests on x86 unless we use --with-big-tables,
+# suggesting that upstream doesn't bother to test the other case ...
 %configure \
 	--with-readline \
-	--with-openssl \
+	--with-ssl=/usr \
 	--without-debug \
 	--enable-shared \
 	--with-bench \
@@ -206,9 +203,9 @@
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
+	--with-big-tables \
 	--with-innodb \
 	--with-ndbcluster \
-	--with-berkeley-db \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
@@ -226,10 +223,14 @@
 cd libmysqld/work
 ar -x ../libmysqld.a
 gcc -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 *.o \
-	../../bdb/build_unix/libdb.a -lpthread -lcrypt -lnsl -lssl -lcrypto -lrt -lstdc++ -lm -lc
+	-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
+# this is to check that we built a complete library
+cp %{SOURCE9} .
+ln -s libmysqld.so.0.0.1 libmysqld.so.0
+gcc -I../../include mysql-embedded-check.c libmysqld.so.0
+LD_LIBRARY_PATH=. ldd ./a.out
 cd ../..
 
-%check
 make check
 
 %if %runselftest
@@ -244,7 +245,9 @@
   esac
   export MTR_BUILD_THREAD
 
-  make test
+  # note: "make test" invokes two largely-duplicate sets of tests,
+  # which makes the runtime really unacceptably long ...
+  make test-ns
 %endif
 
 %install
@@ -258,8 +261,8 @@
   i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
     mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
-    mv $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types_`uname -i`.h
-    install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/ndb/
+    mv $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types_`uname -i`.h
+    install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/
     ;;
   *)
     ;;
@@ -303,6 +306,8 @@
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libndbclient.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
@@ -315,6 +320,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
 rm -f ${RPM_BUILD_ROOT}/usr/libexec/ndb_cpcd
@@ -400,7 +406,6 @@
 %{_bindir}/mysql
 %{_bindir}/mysql_config
 %{_bindir}/mysql_find_rows
-%{_bindir}/mysql_tableinfo
 %{_bindir}/mysql_waitpid
 %{_bindir}/mysqlaccess
 %{_bindir}/mysqladmin
@@ -409,6 +414,7 @@
 %{_bindir}/mysqldump
 %{_bindir}/mysqlimport
 %{_bindir}/mysqlshow
+%{_bindir}/mysqlslap
 %{_bindir}/my_print_defaults
 
 %{_infodir}/*
@@ -416,12 +422,12 @@
 %{_mandir}/man1/mysql.1*
 %{_mandir}/man1/mysql_config.1*
 %{_mandir}/man1/mysql_find_rows.1*
-%{_mandir}/man1/mysql_tableinfo.1*
 %{_mandir}/man1/mysql_waitpid.1*
 %{_mandir}/man1/mysqlaccess.1*
 %{_mandir}/man1/mysqladmin.1*
 %{_mandir}/man1/mysqldump.1*
 %{_mandir}/man1/mysqlshow.1*
+%{_mandir}/man1/mysqlslap.1*
 %{_mandir}/man1/my_print_defaults.1*
 
 %{_libdir}/mysql/mysqlbug
@@ -474,7 +480,6 @@
 %{_bindir}/myisamlog
 %{_bindir}/myisampack
 %{_bindir}/mysql_convert_table_format
-%{_bindir}/mysql_explain_log
 %{_bindir}/mysql_fix_extensions
 %{_bindir}/mysql_fix_privilege_tables
 %{_bindir}/mysql_install_db
@@ -482,16 +487,12 @@
 %{_bindir}/mysql_setpermission
 %{_bindir}/mysql_tzinfo_to_sql
 %{_bindir}/mysql_upgrade
-%{_bindir}/mysql_upgrade_shell
 %{_bindir}/mysql_zap
 %{_bindir}/mysqlbug
 %{_bindir}/mysqldumpslow
 %{_bindir}/mysqld_multi
 %{_bindir}/mysqld_safe
 %{_bindir}/mysqlhotcopy
-%{_bindir}/mysqltestmanager
-%{_bindir}/mysqltestmanager-pwgen
-%{_bindir}/mysqltestmanagerc
 %{_bindir}/mysqltest
 %{_bindir}/innochecksum
 %{_bindir}/perror
@@ -502,6 +503,8 @@
 /usr/libexec/mysqld
 /usr/libexec/mysqlmanager
 
+%{_libdir}/mysql/plugin
+
 %{_mandir}/man1/msql2mysql.1*
 %{_mandir}/man1/myisamchk.1*
 %{_mandir}/man1/myisamlog.1*
@@ -509,7 +512,6 @@
 %{_mandir}/man1/mysql_convert_table_format.1*
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/mysql.server.1*
-%{_mandir}/man1/mysql_explain_log.1*
 %{_mandir}/man1/mysql_fix_extensions.1*
 %{_mandir}/man1/mysql_fix_privilege_tables.1*
 %{_mandir}/man1/mysql_install_db.1*
@@ -531,10 +533,7 @@
 %{_mandir}/man1/replace.1*
 %{_mandir}/man1/resolve_stack_dump.1*
 %{_mandir}/man1/resolveip.1*
-%{_mandir}/man1/safe_mysqld.1*
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
-%{_mandir}/man1/mysqlmanager-pwgen.1*
-%{_mandir}/man1/mysqlmanagerc.1*
 %{_mandir}/man8/mysqld.8*
 %{_mandir}/man8/mysqlmanager.8*
 
@@ -545,6 +544,8 @@
 %{_datadir}/mysql/mysql_system_tables_data.sql
 %{_datadir}/mysql/mysql_test_data_timezone.sql
 %{_datadir}/mysql/my-*.cnf
+%{_datadir}/mysql/config.*.ini
+
 /etc/rc.d/init.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
@@ -560,6 +561,9 @@
 %{_bindir}/ndb_drop_table
 %{_bindir}/ndb_error_reporter
 %{_bindir}/ndb_mgm
+%{_bindir}/ndb_print_backup_file
+%{_bindir}/ndb_print_schema_file
+%{_bindir}/ndb_print_sys_file
 %{_bindir}/ndb_restore
 %{_bindir}/ndb_select_all
 %{_bindir}/ndb_select_count
@@ -593,12 +597,14 @@
 %{_mandir}/man1/ndb_show_tables.1*
 #%{_mandir}/man1/ndb_size.pl.1*
 %{_mandir}/man1/ndb_waiter.1*
+%{_mandir}/man1/ndbd_redo_log_reader.1*
 %{_mandir}/man8/ndbd.8*
 %{_mandir}/man8/ndb_mgmd.8*
 
 %files devel
 %defattr(-,root,root)
 /usr/include/mysql
+/usr/share/aclocal/mysql.m4
 %{_libdir}/mysql/*.a
 %{_libdir}/mysql/libmysqlclient*.so
 %{_libdir}/mysql/libndbclient.so
@@ -627,6 +633,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Jan 14 2009 Tom Lane <tgl at redhat.com> 5.1.30-1
+- Update to MySQL 5.1.30.  Note that this includes an ABI break for
+  libmysqlclient (it's now got .so major version 16).
+
 * Wed Oct  1 2008 Tom Lane <tgl at redhat.com> 5.0.67-2
 - Build the "embedded server" library, and package it in a new sub-RPM
   mysql-embedded, along with mysql-embedded-devel for devel support files.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Aug 2008 20:31:19 -0000	1.33
+++ sources	14 Jan 2009 17:10:05 -0000	1.34
@@ -1 +1 @@
-7164483a5ffb8f7aa59b761c13cdbd6e  mysql-5.0.67.tar.gz
+b658e58887a74dce65224ae0fc8ee06a  mysql-5.1.30.tar.gz


--- mysql-bdb-link.patch DELETED ---


--- mysql-bdb-open.patch DELETED ---


--- mysql-libdir.patch DELETED ---


--- mysql-no-atomic.patch DELETED ---


--- mysql-no-dbug.patch DELETED ---


--- mysql-rpl-test.patch DELETED ---


--- mysql-rpl_ddl.patch DELETED ---


