rpms/mysql/FC-3 mysql-3.23.58-testing.patch, NONE, 1.1 mysql-3.23.58-security2.patch, 1.1, 1.2 mysql.spec, 1.34, 1.35
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Apr 3 03:56:27 UTC 2005
Update of /cvs/dist/rpms/mysql/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv15088
Modified Files:
mysql-3.23.58-security2.patch mysql.spec
Added Files:
mysql-3.23.58-testing.patch
Log Message:
Repair uninitialized variable.
mysql-3.23.58-testing.patch:
mysql-test-run.sh | 13 +++++++++++--
t/rpl000014.test | 4 ++++
t/rpl000015.test | 3 +++
t/rpl_rotate_logs.test | 3 +++
4 files changed, 21 insertions(+), 2 deletions(-)
--- NEW FILE mysql-3.23.58-testing.patch ---
This patch is needed to improve the probability that the MySQL tests pass
in Red Hat's build environment. The 32-bit and 64-bit variants of a single
architecture may be built on the same machine at the same time, so we have
to ensure that the tests use different port numbers on a 64-bit arch than
on a 32-bit, else they will interfere with each other.
diff -Naur mysql-3.23.58.orig/mysql-test/mysql-test-run.sh mysql-3.23.58/mysql-test/mysql-test-run.sh
--- mysql-3.23.58.orig/mysql-test/mysql-test-run.sh 2003-09-11 07:49:21.000000000 -0400
+++ mysql-3.23.58/mysql-test/mysql-test-run.sh 2005-04-02 19:29:22.363345954 -0500
@@ -121,11 +121,20 @@
export LD_LIBRARY_PATH
MASTER_RUNNING=0
-MASTER_MYPORT=9306
SLAVE_RUNNING=0
-SLAVE_MYPORT=9307
NO_SLAVE=0
USER_TEST=
+# hack to allow 32- and 64-bit tests to run concurrently on same build machine
+case `uname -m` in
+ ppc64 | s390x | x86_64)
+ MASTER_MYPORT=9404
+ SLAVE_MYPORT=9405
+ ;;
+ *)
+ MASTER_MYPORT=9304
+ SLAVE_MYPORT=9305
+ ;;
+esac
EXTRA_MASTER_OPT=""
EXTRA_MYSQL_TEST_OPT=""
diff -Naur mysql-3.23.58.orig/mysql-test/t/rpl000014.test mysql-3.23.58/mysql-test/t/rpl000014.test
--- mysql-3.23.58.orig/mysql-test/t/rpl000014.test 2003-09-11 08:00:03.000000000 -0400
+++ mysql-3.23.58/mysql-test/t/rpl000014.test 2005-04-02 20:29:07.911405123 -0500
@@ -4,18 +4,18 @@
save_master_pos;
connection slave;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
change master to master_log_pos=73;
slave stop;
change master to master_log_pos=73;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
slave start;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
change master to master_log_pos=173;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
connection master;
show master status;
diff -Naur mysql-3.23.58.orig/mysql-test/t/rpl000015.test mysql-3.23.58/mysql-test/t/rpl000015.test
--- mysql-3.23.58.orig/mysql-test/t/rpl000015.test 2003-09-11 08:00:03.000000000 -0400
+++ mysql-3.23.58/mysql-test/t/rpl000015.test 2005-04-02 20:29:33.040987001 -0500
@@ -8,15 +8,15 @@
reset slave;
show slave status;
change master to master_host='127.0.0.1';
---replace_result 3306 9998 9306 9999 3334 9999 3335 9999
+--replace_result 3306 9998 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
slave start;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
connection master;
drop table if exists t1;
diff -Naur mysql-3.23.58.orig/mysql-test/t/rpl_rotate_logs.test mysql-3.23.58/mysql-test/t/rpl_rotate_logs.test
--- mysql-3.23.58.orig/mysql-test/t/rpl_rotate_logs.test 2003-09-11 08:00:03.000000000 -0400
+++ mysql-3.23.58/mysql-test/t/rpl_rotate_logs.test 2005-04-02 20:29:28.292632875 -0500
@@ -40,7 +40,7 @@
save_master_pos;
connection slave;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
select * from t1;
connection master;
@@ -96,7 +96,7 @@
save_master_pos;
connection slave;
sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
select * from t2;
@@ -126,7 +126,7 @@
sync_with_master;
select * from t4;
---replace_result 9306 9999 3334 9999 3335 9999
+--replace_result 9306 9999 3334 9999 3335 9999 9304 9999 9404 9999
show slave status;
# because of concurrent insert, the table may not be up to date
# if we do not lock
mysql-3.23.58-security2.patch:
include/my_global.h | 3 +
isam/create.c | 5 +-
merge/create.c | 2
myisam/mi_create.c | 13 +++--
myisammrg/myrg_create.c | 2
mysys/mf_tempfile.c | 8 +--
sql/ha_myisam.cc | 18 ++++----
sql/mysql_priv.h | 3 -
sql/mysqld.cc | 11 ++++
sql/share/english/errmsg.txt | 2
sql/sql_udf.cc | 96 +++++++++++++++++++++++++++++--------------
sql/table.cc | 6 ++
12 files changed, 114 insertions(+), 55 deletions(-)
Index: mysql-3.23.58-security2.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-3/mysql-3.23.58-security2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-3.23.58-security2.patch 19 Mar 2005 03:56:34 -0000 1.1
+++ mysql-3.23.58-security2.patch 3 Apr 2005 03:56:23 -0000 1.2
@@ -162,7 +162,7 @@
{
int error;
- uint i,j,recpos,minpos,fieldpos,temp_length,length;
-+ uint i,j,recpos,minpos,fieldpos,temp_length,length, create_flags;
++ uint i,j,recpos,minpos,fieldpos,temp_length,length, create_flags=0;
bool found_auto_increment=0;
enum ha_base_keytype type;
char buff[FN_REFLEN];
Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/FC-3/mysql.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mysql.spec 19 Mar 2005 21:26:29 -0000 1.34
+++ mysql.spec 3 Apr 2005 03:56:23 -0000 1.35
@@ -1,6 +1,6 @@
Name: mysql
Version: 3.23.58
-Release: 15.FC3.1
+Release: 16.FC3.1
Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
Source1: mysql.init
Source2: mysql.logrotate
@@ -20,6 +20,7 @@
Patch9: mysql-3.23.58-security.patch
Patch10: mysql-3.23.58-selinux.patch
Patch11: mysql-3.23.58-security2.patch
+Patch12: mysql-3.23.58-testing.patch
URL: http://www.mysql.com
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: MySQL client programs and shared libraries.
@@ -103,6 +104,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
libtoolize --force
aclocal
@@ -142,7 +144,7 @@
make %{?_smp_mflags}
make check
-%ifnarch ppc ppc64 ia64 s390 s390x
+%ifnarch s390x
make test
%endif
@@ -313,6 +315,11 @@
%{_datadir}/sql-bench
%changelog
+* Sat Apr 2 2005 Tom Lane <tgl at redhat.com> 3.23.58-16.FC3.1
+- Repair uninitialized variable in security2 patch.
+- Enable testing on 64-bit arches; continue to exclude s390x which still
+ has issues.
+
* Sat Mar 19 2005 Tom Lane <tgl at redhat.com> 3.23.58-15.FC3.1
- Backpatch repair for CAN-2005-0709, CAN-2005-0710, CAN-2005-0711 (bz#151051).
- Run 'make test' only on the archs we support for FC-3.
More information about the fedora-cvs-commits
mailing list