rpms/mysql/FC-4 mysql-buffer-nazi.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 mysql-lock-ssl.patch, 1.1, 1.2 mysql-no-atomic.patch, 1.1, 1.2 mysql-test-ssl.patch, 1.1, 1.2 mysql.spec, 1.53, 1.54 sources, 1.20, 1.21

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 12 20:02:28 UTC 2005


Author: tgl

Update of /cvs/dist/rpms/mysql/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7577

Modified Files:
	.cvsignore mysql-lock-ssl.patch mysql-no-atomic.patch 
	mysql-test-ssl.patch mysql.spec sources 
Added Files:
	mysql-buffer-nazi.patch 
Log Message:
Update to MySQL 4.1.12; backport various minor fixes from devel branch.

mysql-buffer-nazi.patch:
 test3.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-buffer-nazi.patch ---
This patch is fairly pointless since it fixes a one-byte overflow in test code
that no one will care about or execute in the real world ... but it shuts up a
build warning from our security checker.  Patch based on MySQL AB's fix to
the same issue in myisam/mi_test3.c; we hadn't seen this case before
mysql-4.1.12-1, because we weren't building the isam code.

Reported upstream as http://bugs.mysql.com/bug.php?id=11891


diff -Naur mysql-4.1.12.orig/isam/test3.c mysql-4.1.12/isam/test3.c
--- mysql-4.1.12.orig/isam/test3.c	2005-05-13 07:32:18.000000000 -0400
+++ mysql-4.1.12/isam/test3.c	2005-07-12 14:10:01.000000000 -0400
@@ -360,7 +360,7 @@
   }
 
   sprintf(record.id,"%7d",(int) getpid());
-  strmov(record.text,"Testing...");
+  strnmov(record.text,"Testing...", sizeof(record.text));
 
   tries=(uint) rnd(100)+10;
   for (i=count=0 ; i < tries ; i++)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	8 Apr 2005 00:02:33 -0000	1.20
+++ .cvsignore	12 Jul 2005 20:02:08 -0000	1.21
@@ -1 +1 @@
-mysql-4.1.11.tar.gz
+mysql-4.1.12.tar.gz

mysql-lock-ssl.patch:
 mysqld.cc |   99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+)

Index: mysql-lock-ssl.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/mysql-lock-ssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-lock-ssl.patch	9 May 2005 20:15:04 -0000	1.1
+++ mysql-lock-ssl.patch	12 Jul 2005 20:02:25 -0000	1.2
@@ -1,100 +1,95 @@
-This is a port of a patch by Leandro Santi described here:
+This is a back-patch to 4.1.12 of the patch shown here:
+http://lists.mysql.com/internals/26444
+to fix
 http://bugs.mysql.com/bug.php?id=9270
+which I think may be related to our bz#155850, and is certainly a
+"must fix" for any use of SSL in any case.
 
 
-diff -Naur mysql-4.1.11.orig/sql/mysqld.cc mysql-4.1.11/sql/mysqld.cc
---- mysql-4.1.11.orig/sql/mysqld.cc	2005-04-01 06:36:46.000000000 -0500
-+++ mysql-4.1.11/sql/mysqld.cc	2005-05-09 14:50:12.000000000 -0400
-@@ -501,8 +501,25 @@
+diff -Naur mysql-4.1.12.orig/sql/mysqld.cc mysql-4.1.12/sql/mysqld.cc
+--- mysql-4.1.12.orig/sql/mysqld.cc	2005-05-13 07:32:05.000000000 -0400
++++ mysql-4.1.12/sql/mysqld.cc	2005-07-11 13:27:07.000000000 -0400
+@@ -501,8 +501,22 @@
  
  #include "sslopt-vars.h"
  #ifdef HAVE_OPENSSL
-+#include <my_pthread.h>
 +#include <openssl/crypto.h>
 +
-+typedef struct CRYPTO_dynlock_value {
++typedef struct CRYPTO_dynlock_value
++{
 +  rw_lock_t lock;
-+  const char *name;
 +} openssl_lock_t;
 +
  char *des_key_file;
  struct st_VioSSLAcceptorFd *ssl_acceptor_fd;
-+static openssl_lock_t openssl_stdlocks[CRYPTO_NUM_LOCKS];
++static openssl_lock_t *openssl_stdlocks;
 +
-+static void openssl_locking_init(void);
-+static void openssl_locking_cleanup(void);
 +static openssl_lock_t *openssl_dynlock_create(const char *, int);
 +static void openssl_dynlock_destroy(openssl_lock_t *, const char *, int);
-+static void openssl_stdlock(int, int, const char *, int);
++static void openssl_lock_function(int, int, const char *, int);
 +static void openssl_lock(int, openssl_lock_t *, const char *, int);
-+static unsigned long openssl_id_function(void);
++static unsigned long openssl_id_function();
  #endif /* HAVE_OPENSSL */
  
  
-@@ -1051,6 +1068,9 @@
- 
- static void clean_up_mutexes()
- {
+@@ -1083,6 +1097,11 @@
+   (void) pthread_cond_destroy(&COND_thread_cache);
+   (void) pthread_cond_destroy(&COND_flush_thread_cache);
+   (void) pthread_cond_destroy(&COND_manager);
 +#ifdef HAVE_OPENSSL
-+  openssl_locking_cleanup();
-+#endif /* HAVE_OPENSSL */
-   (void) pthread_mutex_destroy(&LOCK_mysql_create_db);
-   (void) pthread_mutex_destroy(&LOCK_Acl);
-   (void) rwlock_destroy(&LOCK_grant);
-@@ -2205,6 +2225,99 @@
- #endif	/* __WIN__*/
- 
- 
++  for (int i= 0; i < CRYPTO_num_locks(); ++i)
++    (void) rwlock_destroy(&openssl_stdlocks[i].lock);
++  OPENSSL_free(openssl_stdlocks);
++#endif
+ }
+ 
+ /****************************************************************************
+@@ -2599,10 +2618,90 @@
+     sql_print_error("Can't create thread-keys");
+     return 1;
+   }
 +#ifdef HAVE_OPENSSL
-+
-+/* See http://www.openssl.org/docs/crypto/threads.html. */
-+
-+static void openssl_locking_init(void)
-+{
-+  /* Setup the array of locks. */
-+  for (int i = 0; i < CRYPTO_NUM_LOCKS; ++i) {
-+    my_rwlock_init(&openssl_stdlocks[i].lock, NULL);
-+    openssl_stdlocks[i].name = CRYPTO_get_lock_name(i);
-+  }
-+  /* Tell OpenSSL how to lock and unlock itself. */
++  openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
++                                                     sizeof(openssl_lock_t));
++  for (int i= 0; i < CRYPTO_num_locks(); ++i)
++    (void) my_rwlock_init(&openssl_stdlocks[i].lock, NULL);
 +  CRYPTO_set_dynlock_create_callback(openssl_dynlock_create);
 +  CRYPTO_set_dynlock_destroy_callback(openssl_dynlock_destroy);
 +  CRYPTO_set_dynlock_lock_callback(openssl_lock);
-+  CRYPTO_set_locking_callback(openssl_stdlock);
++  CRYPTO_set_locking_callback(openssl_lock_function);
 +  CRYPTO_set_id_callback(openssl_id_function);
-+}
-+
-+static void openssl_locking_cleanup(void)
-+{
-+  for (int i = 0; i < CRYPTO_NUM_LOCKS; ++i)
-+    rwlock_destroy(&openssl_stdlocks[i].lock);
-+}
-+
-+static unsigned long openssl_id_function(void)
++#endif
+   return 0;
+ }
+ 
+ 
++#ifdef HAVE_OPENSSL
++static unsigned long openssl_id_function()
 +{
 +  return (unsigned long) pthread_self();
 +}
 +
++
 +static openssl_lock_t *openssl_dynlock_create(const char *file, int line)
 +{
-+  openssl_lock_t *lock = new openssl_lock_t;
++  openssl_lock_t *lock= new openssl_lock_t;
 +  my_rwlock_init(&lock->lock, NULL);
-+  lock->name = "dynamic";
++  return lock;
 +}
 +
-+static void openssl_dynlock_destroy(openssl_lock_t *lock, const char *file, int line)
++
++static void openssl_dynlock_destroy(openssl_lock_t *lock, const char *file,
++                                   int line)
 +{
 +  rwlock_destroy(&lock->lock);
 +  delete lock;
 +}
 +
-+static void openssl_stdlock(int mode, int n, const char *file, int line)
++
++static void openssl_lock_function(int mode, int n, const char *file, int line)
 +{
-+  /* 
-+   * XXX Sanity: check for potential interface problems with
-+   * newer OpenSSL versions. Bail out if problems are detected.
-+   */
-+  if (n < 0 || n > CRYPTO_NUM_LOCKS) {
++  if (n < 0 || n > CRYPTO_num_locks())
++  {
 +    /* Lock number out of bounds. */
 +    sql_print_error("Fatal: OpenSSL interface problem (n = %d)", n);
 +    abort();
@@ -102,10 +97,12 @@
 +  openssl_lock(mode, &openssl_stdlocks[n], file, line);
 +}
 +
-+static void openssl_lock(int mode, openssl_lock_t *lock, const char *file, int line)
++
++static void openssl_lock(int mode, openssl_lock_t *lock, const char *file,
++                        int line)
 +{
-+  int err = 1;
-+  char const *what = 0;
++  int err;
++  char const *what;
 +
 +  switch (mode) {
 +  case CRYPTO_LOCK|CRYPTO_READ:
@@ -126,26 +123,15 @@
 +    sql_print_error("Fatal: OpenSSL interface problem (mode=0x%x)", mode);
 +    abort();
 +  }
-+  if (err) {
-+    /* 
-+     * XXX Locking problem. It seems that other MySQL modules are
-+     * completely ignoring these important problems, but I won't.
-+     */
-+    sql_print_error("Fatal: can't %s OpenSSL %s lock", what, lock->name);
++  if (err)
++  {
++    sql_print_error("Fatal: can't %s OpenSSL %s lock", what);
 +    abort();
 +  }
 +}
 +#endif /* HAVE_OPENSSL */
 +
 +
- /*
-   All global error messages are sent here where the first one is stored for
-   the client
-@@ -2599,6 +2712,7 @@
  static void init_ssl()
  {
  #ifdef HAVE_OPENSSL
-+  openssl_locking_init();
-   if (opt_use_ssl)
-   {
-     /* having ssl_acceptor_fd != 0 signals the use of SSL */

mysql-no-atomic.patch:
 configure.in |   37 -------------------------------------
 1 files changed, 37 deletions(-)

Index: mysql-no-atomic.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/mysql-no-atomic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-no-atomic.patch	8 Apr 2005 21:58:27 -0000	1.1
+++ mysql-no-atomic.patch	12 Jul 2005 20:02:25 -0000	1.2
@@ -3,17 +3,14 @@
 which is we avoid the 4-vs-8-byte problem in BDB that formerly required
 mysql-threads.patch.
 
-If you're wondering about the hack on Docs/Makefile.am, it's to prevent
-it from deciding we need to rebuild the docs after patching configure.in.
 
-
-diff -Naur mysql-4.1.11.orig/configure.in mysql-4.1.11/configure.in
---- mysql-4.1.11.orig/configure.in	2005-04-01 06:36:51.000000000 -0500
-+++ mysql-4.1.11/configure.in	2005-04-08 16:16:18.000000000 -0400
-@@ -842,43 +842,6 @@
+diff -Naur mysql-4.1.12.orig/configure.in mysql-4.1.12/configure.in
+--- mysql-4.1.12.orig/configure.in	2005-05-13 07:32:33.000000000 -0400
++++ mysql-4.1.12/configure.in	2005-07-11 12:16:28.000000000 -0400
+@@ -862,43 +862,6 @@
  AC_SUBST(WRAPLIBS)
  
- if test "$IS_LINUX" = "true"; then
+ if test "$TARGET_LINUX" = "true"; then
 -  AC_MSG_CHECKING([for atomic operations])
 -
 -  atom_ops=
@@ -54,15 +51,3 @@
    AC_ARG_WITH(pstack,
      [  --with-pstack           Use the pstack backtrace library],
      [ USE_PSTACK=$withval ],
-diff -Naur mysql-4.1.11.orig/Docs/Makefile.am mysql-4.1.11/Docs/Makefile.am
---- mysql-4.1.11.orig/Docs/Makefile.am	2005-04-01 06:36:45.000000000 -0500
-+++ mysql-4.1.11/Docs/Makefile.am	2005-04-08 16:47:02.865502712 -0400
-@@ -41,7 +41,7 @@
- #########################################################################
- 
- # The Makefile contains the previous version so we can not use that
--include.texi:	../configure.in
-+include.texi:
- 	echo "@c This file is autogenerated by the Makefile" > $@
- 	echo -n "@set mysqlversion " >> $@
- 	grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \

mysql-test-ssl.patch:
 mysql-4.1.11/Makefile.am                     |    4 +++-
 mysql-4.1.12/mysql-test/r/rpl_openssl.result |    8 ++++++--
 mysql-4.1.12/mysql-test/t/rpl_openssl.test   |   12 ++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

Index: mysql-test-ssl.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/mysql-test-ssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-test-ssl.patch	26 Apr 2005 04:34:53 -0000	1.1
+++ mysql-test-ssl.patch	12 Jul 2005 20:02:25 -0000	1.2
@@ -1,4 +1,14 @@
-So why doesn't this happen automatically given the configure option??
+Hacks needed to run MySQL openssl tests:
+
+1. Enable the test in Makefile.  (Why doesn't this happen automatically given
+the configure option??)
+
+2. Work around silliness in rpl_openssl test: the ''@'testhost%' user entry
+takes precedence over the replssl@'%' one.  Probably a better solution would
+be to change replssl@'%' to replssl at localhost, but this does not work because
+that's not how the slave tries to connect, and I don't know how to override
+that in MySQL.  This has been an open upstream bug for awhile, see
+http://bugs.mysql.com/bug.php?id=10860
 
 
 diff -Naur mysql-4.1.11.orig/Makefile.am mysql-4.1.11/Makefile.am
@@ -13,3 +23,60 @@
  test:
 -	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
 +	cd mysql-test; ./mysql-test-run $(TEST_OPTIONS) && ./mysql-test-run $(TEST_OPTIONS) --ps-protocol
+diff -Naur mysql-4.1.12.orig/mysql-test/r/rpl_openssl.result mysql-4.1.12/mysql-test/r/rpl_openssl.result
+--- mysql-4.1.12.orig/mysql-test/r/rpl_openssl.result	2005-05-13 08:04:04.000000000 -0400
++++ mysql-4.1.12/mysql-test/r/rpl_openssl.result	2005-07-11 21:21:44.000000000 -0400
+@@ -5,6 +5,8 @@
+ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+ start slave;
+ grant replication slave on *.* to replssl@'%' require ssl;
++update mysql.user set user = 'xyzzy' where user = '';
++flush privileges;
+ create table t1 (t int);
+ stop slave;
+ change master to master_user='replssl',master_password='';
+@@ -20,11 +22,13 @@
+ 1
+ show slave status;
+ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
+-#	127.0.0.1	replssl	MASTER_MYPORT	1	master-bin.000001	289	slave-relay-bin.000001	108	master-bin.000001	Yes	Yes							0		0	289	108	None		0	Yes	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
++#	127.0.0.1	replssl	MASTER_MYPORT	1	master-bin.000001	427	slave-relay-bin.000001	108	master-bin.000001	Yes	Yes							0		0	427	108	None		0	Yes	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
+ stop slave;
+ change master to master_user='root',master_password='', master_ssl=0;
+ start slave;
++update mysql.user set user = '' where user = 'xyzzy';
++flush privileges;
+ drop table t1;
+ show slave status;
+ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
+-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	337	slave-relay-bin.000001	96	master-bin.000001	Yes	Yes							0		0	337	96	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
++#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	613	slave-relay-bin.000001	234	master-bin.000001	Yes	Yes							0		0	613	234	None		0	No	MYSQL_TEST_DIR/std_data/cacert.pem		MYSQL_TEST_DIR/std_data/client-cert.pem		MYSQL_TEST_DIR/std_data/client-key.pem	#
+diff -Naur mysql-4.1.12.orig/mysql-test/t/rpl_openssl.test mysql-4.1.12/mysql-test/t/rpl_openssl.test
+--- mysql-4.1.12.orig/mysql-test/t/rpl_openssl.test	2005-05-13 08:03:59.000000000 -0400
++++ mysql-4.1.12/mysql-test/t/rpl_openssl.test	2005-07-11 20:42:10.000000000 -0400
+@@ -8,6 +8,13 @@
+ # preparing playground
+ connection master;
+ grant replication slave on *.* to replssl@'%' require ssl;
++
++# the replssl user entry is lower priority than the anonymous entries
++# because of its overly loose host wildcard.  Easiest solution is to
++# temporarily cripple anonymous login ...
++update mysql.user set user = 'xyzzy' where user = '';
++flush privileges;
++
+ create table t1 (t int);
+ save_master_pos;
+ 
+@@ -53,6 +60,11 @@
+ change master to master_user='root',master_password='', master_ssl=0;
+ start slave;
+ connection master;
++
++# Restore the anonymous user entries
++update mysql.user set user = '' where user = 'xyzzy';
++flush privileges;
++
+ drop table t1;
+ save_master_pos;
+ connection slave;


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/mysql.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mysql.spec	9 May 2005 20:15:04 -0000	1.53
+++ mysql.spec	12 Jul 2005 20:02:25 -0000	1.54
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 4.1.11
-Release: 4
+Version: 4.1.12
+Release: 2.FC4.1
 Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source2: mysql.logrotate
@@ -15,6 +15,7 @@
 Patch5: mysql-no-atomic.patch
 Patch6: mysql-lock-ssl.patch
 Patch7: mysql-test-ssl.patch
+Patch8: mysql-buffer-nazi.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client programs and shared libraries.
@@ -64,6 +65,7 @@
 License: GPL
 Group: Applications/Databases
 Requires: %{name} = %{version}-%{release}
+Requires: openssl-devel
 Conflicts: MySQL-devel
 
 %description devel
@@ -94,6 +96,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 libtoolize --force
 aclocal
@@ -119,16 +122,16 @@
 	--with-openssl \
 	--without-debug \
 	--enable-shared \
-	--with-extra-charsets=complex \
 	--with-bench \
 	--localstatedir=/var/lib/mysql \
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
 	--with-innodb \
+	--with-isam \
+	--with-berkeley-db \
 	--enable-local-infile \
 	--enable-large-files=yes --enable-largefile=yes \
-	--with-berkeley-db \
 	--enable-thread-safe-client \
 	--disable-dependency-tracking \
 	--with-named-thread-libs="-lpthread"
@@ -169,8 +172,6 @@
 mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
 install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
 
-# Doesn't contain anything
-rm -f Docs/manual.ps
 rm -fr $RPM_BUILD_ROOT/usr/mysql-test
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/*client_test
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err
@@ -189,9 +190,6 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
 
-# compress manual
-bzip2 Docs/manual.txt
-
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
@@ -241,7 +239,6 @@
 %files
 %defattr(-,root,root)
 %doc README COPYING
-%doc Docs/manual.txt.bz2 Docs/mysqld_error.txt
 
 %{_bindir}/msql2mysql
 %{_bindir}/mysql
@@ -368,6 +365,18 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Tue Jul 12 2005 Tom Lane <tgl at redhat.com> 4.1.12-2.FC4.1
+- Update to MySQL 4.1.12 (includes a fix for bz#158688, bz#158689)
+- Extend mysql-test-ssl.patch to solve rpl_openssl test failure (bz#155850)
+- Update mysql-lock-ssl.patch to match the upstream committed version
+- Add --with-isam to re-enable the old ISAM table type, per bz#159262
+- Add dependency on openssl-devel per bz#159569
+- Remove manual.txt, as upstream decided not to ship it anymore;
+  it was redundant with the mysql.info file anyway.
+- Fix buffer overflow newly exposed in isam code; it's the same issue
+  previously found in myisam, and not very exciting, but I'm tired of
+  seeing build warnings.
+
 * Mon May  9 2005 Tom Lane <tgl at redhat.com> 4.1.11-4
 - Include proper locking for OpenSSL in the server, per bz#155850
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-4/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Apr 2005 00:02:33 -0000	1.20
+++ sources	12 Jul 2005 20:02:25 -0000	1.21
@@ -1 +1 @@
-0b99001b07cad53f161ec629a6bb24ea  mysql-4.1.11.tar.gz
+56a6f5cacd97ae290e07bbe19f279af1  mysql-4.1.12.tar.gz




More information about the fedora-cvs-commits mailing list