rpms/mysql/devel .cvsignore, 1.22, 1.23 mysql-errno.patch, 1.2, 1.3 mysql-libtool.patch, 1.4, 1.5 mysql-test-ssl.patch, 1.3, 1.4 mysql.spec, 1.57, 1.58 sources, 1.22, 1.23 mysql-buffer-warning.patch, 1.1, NONE mysql-lock-ssl.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Nov 3 03:30:53 UTC 2005 

Author: tgl

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

Modified Files:
	.cvsignore mysql-errno.patch mysql-libtool.patch 
	mysql-test-ssl.patch mysql.spec sources 
Removed Files:
	mysql-buffer-warning.patch mysql-lock-ssl.patch 
Log Message:
Update to MySQL 5.0.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	5 Oct 2005 20:10:54 -0000	1.22
+++ .cvsignore	3 Nov 2005 03:30:48 -0000	1.23
@@ -1 +1 @@
-mysql-4.1.14.tar.gz
+mysql-5.0.15.tar.gz

mysql-errno.patch:
 my_global.h |    4 ++++
 1 files changed, 4 insertions(+)

Index: mysql-errno.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql-errno.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-errno.patch	28 Oct 2004 20:05:14 -0000	1.2
+++ mysql-errno.patch	3 Nov 2005 03:30:48 -0000	1.3
@@ -1,7 +1,7 @@
-diff -Naur mysql-4.1.7-orig/include/my_global.h mysql-4.1.7/include/my_global.h
---- mysql-4.1.7-orig/include/my_global.h	2004-10-23 03:28:43.000000000 -0400
-+++ mysql-4.1.7/include/my_global.h	2004-10-27 21:13:26.335448200 -0400
-@@ -102,6 +102,10 @@
+diff -Naur mysql-5.0.15.orig/include/my_global.h mysql-5.0.15/include/my_global.h
+--- mysql-5.0.15.orig/include/my_global.h	2005-10-16 21:27:27.000000000 -0400
++++ mysql-5.0.15/include/my_global.h	2005-11-02 16:16:37.000000000 -0500
+@@ -107,6 +107,10 @@
  #define _GNU_SOURCE 1
  #endif
  
@@ -9,6 +9,6 @@
 +#define HAVE_ERRNO_AS_DEFINE
 +#endif
 +
- /* The client defines this to avoid all thread code */
- #if defined(UNDEF_THREADS_HACK)
- #undef THREAD
+ /*
+   Temporary solution to solve bug#7156. Include "sys/types.h" before
+   the thread headers, else the function madvise() will not be defined

mysql-libtool.patch:
 mysql-test-run.sh |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

Index: mysql-libtool.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql-libtool.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-libtool.patch	8 Apr 2005 00:02:33 -0000	1.4
+++ mysql-libtool.patch	3 Nov 2005 03:30:48 -0000	1.5
@@ -8,10 +8,10 @@
 binary-dependent than it ought to be.  Adding/removing --with-vio should
 not break things, but it breaks mysqltest.)
 
-diff -Naur mysql-4.1.11.orig/mysql-test/mysql-test-run.sh mysql-4.1.11/mysql-test/mysql-test-run.sh
---- mysql-4.1.11.orig/mysql-test/mysql-test-run.sh	2005-04-01 06:36:52.000000000 -0500
-+++ mysql-4.1.11/mysql-test/mysql-test-run.sh	2005-04-07 16:03:54.731559342 -0400
-@@ -533,25 +533,11 @@
+diff -Naur mysql-5.0.15.orig/mysql-test/mysql-test-run.sh mysql-5.0.15/mysql-test/mysql-test-run.sh
+--- mysql-5.0.15.orig/mysql-test/mysql-test-run.sh	2005-10-16 21:27:55.000000000 -0400
++++ mysql-5.0.15/mysql-test/mysql-test-run.sh	2005-11-02 16:24:29.000000000 -0500
+@@ -548,30 +548,12 @@
     if [ -n "$VALGRIND" ] ; then
       MYSQLD="$VALGRIND $MYSQLD"
     fi
@@ -30,12 +30,18 @@
 - else
 -   MYSQL_DUMP="$BASEDIR/client/mysqldump"
 - fi
+- if [ -f "$BASEDIR/client/.libs/mysqlshow" ] ; then
+-   MYSQL_SHOW="$BASEDIR/client/.libs/mysqlshow"
+- else
+-   MYSQL_SHOW="$BASEDIR/client/mysqlshow"
+- fi
 - if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then
 -   MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog"
 - else
 -   MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog"
 - fi
 + MYSQL_DUMP="$BASEDIR/client/mysqldump"
++ MYSQL_SHOW="$BASEDIR/client/mysqlshow"
 + MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog"
   if [ -n "$STRACE_CLIENT" ]; then
    MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"

mysql-test-ssl.patch:
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: mysql-test-ssl.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql-test-ssl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-test-ssl.patch	5 Oct 2005 20:10:54 -0000	1.3
+++ mysql-test-ssl.patch	3 Nov 2005 03:30:48 -0000	1.4
@@ -3,87 +3,23 @@
 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
+Note: keep an eye on which version of "mysql-test-run" gets invoked by
+the "make test" target.  In the 4.1 branch this is now defaulting to the
+perl script, but 5.0 is not (yet?) doing that; they also seem to be fooling
+with a C-code version.  Our patches mysql-libtool.patch and
+mysql-testing.patch would need to be changed to use either one.
 
-3. As of MySQL 4.1.14, we are also using this patch to cause "make test"
-to still use the shell-script version of mysql-test-run, instead of the
-new perl version.  Eventually we will probably want to convert to using
-the perl version, but right now I see no benefit.  Note that 
-mysql-libtool.patch and mysql-testing.patch would also need to be changed
-to use the perl script.
 
-
-diff -Naur mysql-4.1.14.orig/Makefile.am mysql-4.1.14/Makefile.am
---- mysql-4.1.14.orig/Makefile.am	2005-08-17 13:06:29.000000000 -0400
-+++ mysql-4.1.14/Makefile.am	2005-10-05 14:50:13.000000000 -0400
-@@ -99,5 +99,7 @@
- 
- # Test installation
+diff -Naur mysql-5.0.15.orig/Makefile.am mysql-5.0.15/Makefile.am
+--- mysql-5.0.15.orig/Makefile.am	2005-10-16 21:27:31.000000000 -0400
++++ mysql-5.0.15/Makefile.am	2005-11-02 20:59:11.000000000 -0500
+@@ -106,7 +106,8 @@
+ MYSQL_TEST_RUN_ARGS =		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
+ 				--master_port=$(MYSQL_TEST_MASTER_PORT) \
+ 				--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
+-				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)
++				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) \
++				--with-openssl
  
-+TEST_OPTIONS = --with-openssl
-+
  test:
--	cd mysql-test; perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol
-+	cd mysql-test; ./mysql-test-run $(TEST_OPTIONS) && ./mysql-test-run $(TEST_OPTIONS) --ps-protocol
-diff -Naur mysql-4.1.14.orig/mysql-test/r/rpl_openssl.result mysql-4.1.14/mysql-test/r/rpl_openssl.result
---- mysql-4.1.14.orig/mysql-test/r/rpl_openssl.result	2005-08-17 13:16:59.000000000 -0400
-+++ mysql-4.1.14/mysql-test/r/rpl_openssl.result	2005-10-05 14:49:28.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.14.orig/mysql-test/t/rpl_openssl.test mysql-4.1.14/mysql-test/t/rpl_openssl.test
---- mysql-4.1.14.orig/mysql-test/t/rpl_openssl.test	2005-08-17 13:16:55.000000000 -0400
-+++ mysql-4.1.14/mysql-test/t/rpl_openssl.test	2005-10-05 14:49:28.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;
+ 	cd mysql-test ; \


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mysql.spec	5 Oct 2005 20:10:54 -0000	1.57
+++ mysql.spec	3 Nov 2005 03:30:48 -0000	1.58
@@ -1,7 +1,7 @@
 Name: mysql
-Version: 4.1.14
+Version: 5.0.15
 Release: 1
-Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz
+Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source2: mysql.logrotate
 Source3: my.cnf
@@ -13,9 +13,7 @@
 Patch3: mysql-libtool.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-no-atomic.patch
-Patch6: mysql-lock-ssl.patch
-Patch7: mysql-test-ssl.patch
-Patch8: mysql-buffer-warning.patch
+Patch6: mysql-test-ssl.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client programs and shared libraries.
@@ -95,8 +93,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 libtoolize --force
 aclocal
@@ -118,7 +114,6 @@
 
 %configure \
 	--with-readline \
-	--with-vio \
 	--with-openssl \
 	--without-debug \
 	--enable-shared \
@@ -128,10 +123,9 @@
 	--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 \
+	--enable-largefile \
 	--enable-thread-safe-client \
 	--disable-dependency-tracking \
 	--with-named-thread-libs="-lpthread"
@@ -281,7 +275,6 @@
 %lang(hu) %{_datadir}/mysql/hungarian
 %lang(it) %{_datadir}/mysql/italian
 %lang(ja) %{_datadir}/mysql/japanese
-%lang(ja) %{_datadir}/mysql/japanese-sjis
 %lang(ko) %{_datadir}/mysql/korean
 %lang(no) %{_datadir}/mysql/norwegian
 %lang(no) %{_datadir}/mysql/norwegian-ny
@@ -301,8 +294,6 @@
 %defattr(-,root,root)
 %doc support-files/*.cnf
 
-%{_bindir}/isamchk
-%{_bindir}/isamlog
 %{_bindir}/my_print_defaults
 %{_bindir}/myisamchk
 %{_bindir}/myisam_ftdump
@@ -322,11 +313,11 @@
 %{_bindir}/mysqld_multi
 %{_bindir}/mysqld_safe
 %{_bindir}/mysqlhotcopy
-%{_bindir}/mysqlmanager
-%{_bindir}/mysqlmanager-pwgen
-%{_bindir}/mysqlmanagerc
+%{_bindir}/mysqltestmanager
+%{_bindir}/mysqltestmanager-pwgen
+%{_bindir}/mysqltestmanagerc
 %{_bindir}/mysqltest
-%{_bindir}/pack_isam
+%{_bindir}/innochecksum
 %{_bindir}/perror
 %{_bindir}/replace
 %{_bindir}/resolve_stack_dump
@@ -334,8 +325,6 @@
 
 /usr/libexec/*
 
-%{_mandir}/man1/isamchk.1*
-%{_mandir}/man1/isamlog.1*
 %{_mandir}/man1/mysql_zap.1*
 %{_mandir}/man1/mysqld.1*
 %{_mandir}/man1/mysql_fix_privilege_tables.1*
@@ -345,6 +334,7 @@
 %{_mandir}/man1/replace.1*
 
 %dir %{_datadir}/mysql
+%{_datadir}/mysql/errmsg.txt
 %{_datadir}/mysql/fill_help_tables.sql
 %{_datadir}/mysql/mysql_fix_privilege_tables.sql
 /etc/rc.d/init.d/mysqld
@@ -365,6 +355,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Wed Nov  2 2005 Tom Lane <tgl at redhat.com> 5.0.15-1
+- Update to MySQL 5.0.15
+
 * Wed Oct  5 2005 Tom Lane <tgl at redhat.com> 4.1.14-1
 - Update to MySQL 4.1.14
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	5 Oct 2005 20:10:54 -0000	1.22
+++ sources	3 Nov 2005 03:30:48 -0000	1.23
@@ -1 +1 @@
-98ba9caea24b0a48ee06bb242ff2e37f  mysql-4.1.14.tar.gz
+b19e03de0ec348552b4bfac2e215f335  mysql-5.0.15.tar.gz


--- mysql-buffer-warning.patch DELETED ---


--- mysql-lock-ssl.patch DELETED ---

More information about the fedora-cvs-commits mailing list