Below is the list of changes that have just been committed into a local
5.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-20 17:52:59+01:00, df@stripped +7 -0
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
MERGE: 1.1810.2359.31
BUILD/check-cpu@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Auto merged
MERGE: 1.13.1.3
mysql-test/mysql-test-run.pl@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Auto merged
MERGE: 1.30.49.44
mysql-test/t/myisam.test@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Auto merged
MERGE: 1.55.1.16
mysql-test/t/query_cache_notembedded.test@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Auto merged
MERGE: 1.2.1.3
mysql-test/t/rpl000017.test@stripped, 2006-12-20 17:52:58+01:00, df@stripped +0 -2
change from 5.0 does not apply here anymore
MERGE: 1.13.1.2
mysql-test/t/rpl_000015.test@stripped, 2006-12-20 17:52:58+01:00, df@stripped +0 -0
after-merge fix
MERGE: 1.31.6.2
mysql-test/t/rpl_000015.test@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Merge rename: mysql-test/t/rpl000015.test -> mysql-test/t/rpl_000015.test
mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-20 17:49:23+01:00, df@stripped +0 -0
Auto merged
MERGE: 1.63.1.3
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: df
# Host: kahlann.erinye.com
# Root: /home/df/mysql/build/mysql-5.1-build-work/RESYNC
--- 1.6/mysql-test/t/query_cache_notembedded.test 2006-11-17 21:29:30 +01:00
+++ 1.7/mysql-test/t/query_cache_notembedded.test 2006-12-20 17:49:23 +01:00
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
#
# do not use QC if tables locked (BUG#12385)
#
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root;
CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
MyISAM;
LOCK TABLE t1 READ LOCAL;
-connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root2;
INSERT INTO t1 VALUES (), (), ();
connection root;
--- 1.255/mysql-test/mysql-test-run.pl 2006-12-18 11:59:07 +01:00
+++ 1.256/mysql-test/mysql-test-run.pl 2006-12-20 17:49:23 +01:00
@@ -58,6 +58,7 @@ $Devel::Trace::TRACE= 0; # Don't t
use File::Path;
use File::Basename;
use File::Copy;
+use File::Temp qw / tempdir /;
use Cwd;
use Getopt::Long;
use Sys::Hostname;
@@ -1019,6 +1020,11 @@ sub command_line_setup () {
# paths.
my $sockdir = $opt_tmpdir;
$sockdir =~ s|/+$||;
+
+ # On some operating systems, there is a limit to the length of a
+ # UNIX domain socket's path far below PATH_MAX, so try to avoid long
+ # socket path names.
+ $sockdir = tempdir(CLEANUP => 1) if ( length($sockdir) > 80 );
# Put this into a hash, will be a C struct
--- 1.71/mysql-test/t/myisam.test 2006-10-09 22:20:19 +02:00
+++ 1.72/mysql-test/t/myisam.test 2006-12-20 17:49:23 +01:00
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5
insert into t2 values (1,1),(2,1);
lock tables t1 read local, t2 read local;
select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
insert into t2 values(2,0);
disconnect root;
connection default;
--- 1.18/BUILD/check-cpu 2006-09-14 07:07:04 +02:00
+++ 1.19/BUILD/check-cpu 2006-12-20 17:49:23 +01:00
@@ -5,9 +5,13 @@
#
check_cpu () {
- if test -r /proc/cpuinfo ; then
+ CPUINFO=/proc/cpuinfo
+ if test -n "$TEST_CPUINFO" ; then
+ CPUINFO=$TEST_CPUINFO
+ fi
+ if test -r "$CPUINFO" -a "$CPUINFO" != " " ; then
# on Linux (and others?) we can get detailed CPU information out of /proc
- cpuinfo="cat /proc/cpuinfo"
+ cpuinfo="cat $CPUINFO"
# detect CPU family
cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
@@ -33,6 +37,7 @@ check_cpu () {
done
else
# Fallback when there is no /proc/cpuinfo
+ CPUINFO=" "
case "`uname -s`" in
FreeBSD|OpenBSD)
cpu_family=`uname -m`;
@@ -84,6 +89,18 @@ check_cpu () {
*Pentium*M*pro*)
cpu_arg="pentium-m";
;;
+ *Celeron\(R\)*\ M*)
+ cpu_arg="pentium-m";
+ ;;
+ *Celeron*Coppermine*)
+ cpu_arg="pentium3"
+ ;;
+ *Celeron\(R\)*)
+ cpu_arg="pentium4"
+ ;;
+ *Celeron*)
+ cpu_arg="pentium2";
+ ;;
*Athlon*64*)
cpu_arg="athlon64";
;;
@@ -120,7 +137,14 @@ check_cpu () {
esac
- if test -z "$cpu_arg"; then
+ if test -z "$cpu_arg" ; then
+ if test "$CPUINFO" != " " ; then
+ # fallback to uname if necessary
+ TEST_CPUINFO=" "
+ check_cpu_cflags=""
+ check_cpu
+ return
+ fi
echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2
check_cpu_cflags=""
return
--- 1.31.6.1/mysql-test/t/rpl000015.test 2006-12-19 15:31:08 +01:00
+++ 1.39/mysql-test/t/rpl_000015.test 2006-12-20 17:52:58 +01:00
@@ -1,3 +1,9 @@
+#####################
+# Change Author: JBM
+# Change Date: 2006-01-17
+# Change: added order by in select
+#####################
+
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master;
@@ -30,12 +36,12 @@ connection master;
--disable_warnings
drop table if exists t1;
--enable_warnings
-create table t1 (n int);
+create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);
sync_slave_with_master;
-select * from t1;
+connection slave;
+SELECT * FROM t1 ORDER BY n;
connection master;
+SELECT * FROM t1 ORDER BY n;
drop table t1;
sync_slave_with_master;
-
-# End of 4.1 tests
--- 1.67/mysql-test/t/rpl_rotate_logs.test 2006-08-30 09:22:41 +02:00
+++ 1.68/mysql-test/t/rpl_rotate_logs.test 2006-12-20 17:49:23 +01:00
@@ -19,7 +19,7 @@ connect (master,localhost,root,,test,$MA
--disable_warnings
drop table if exists t1, t2, t3, t4;
--enable_warnings
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
connection slave;
| Thread |
|---|
| • bk commit into 5.1 tree (df:1.2362) | Daniel Fischer | 20 Dec |
