|
|
Author: tgl
Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14382
Modified Files:
.cvsignore mysql-test-ssl.patch mysql.spec sources
Log Message:
Update to MySQL 4.1.14.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 12 Jul 2005 02:22:11 -0000 1.21
+++ .cvsignore 5 Oct 2005 20:10:54 -0000 1.22
@@ -1 +1 @@
-mysql-4.1.12.tar.gz
+mysql-4.1.14.tar.gz
mysql-test-ssl.patch:
Makefile.am | 4 +++-
mysql-test/r/rpl_openssl.result | 8 ++++++--
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/devel/mysql-test-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-test-ssl.patch 12 Jul 2005 02:22:11 -0000 1.2
+++ mysql-test-ssl.patch 5 Oct 2005 20:10:54 -0000 1.3
@@ -10,10 +10,17 @@
that in MySQL. This has been an open upstream bug for awhile, see
http://bugs.mysql.com/bug.php?id=10860
+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.11.orig/Makefile.am mysql-4.1.11/Makefile.am
---- mysql-4.1.11.orig/Makefile.am 2005-04-01 06:36:46.000000000 -0500
-+++ mysql-4.1.11/Makefile.am 2005-04-25 03:44:35.000000000 -0400
+
+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
@@ -21,11 +28,11 @@
+TEST_OPTIONS = --with-openssl
+
test:
-- cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
+- 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.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
+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;
@@ -51,9 +58,9 @@
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
+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;
Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mysql.spec 23 Aug 2005 13:11:06 -0000 1.56
+++ mysql.spec 5 Oct 2005 20:10:54 -0000 1.57
@@ -1,6 +1,6 @@
Name: mysql
-Version: 4.1.12
-Release: 3
+Version: 4.1.14
+Release: 1
Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz
Source1: mysql.init
Source2: mysql.logrotate
@@ -365,6 +365,9 @@
%{_datadir}/sql-bench
%changelog
+* Wed Oct 5 2005 Tom Lane <tgl@xxxxxxxxxx> 4.1.14-1
+- Update to MySQL 4.1.14
+
* Tue Aug 23 2005 Tom Lane <tgl@xxxxxxxxxx> 4.1.12-3
- Use politically correct patch name.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 12 Jul 2005 02:22:11 -0000 1.21
+++ sources 5 Oct 2005 20:10:54 -0000 1.22
@@ -1 +1 @@
-56a6f5cacd97ae290e07bbe19f279af1 mysql-4.1.12.tar.gz
+98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|