diff options
| author | holyfoot@mysql.com <> | 2005-11-03 20:58:43 +0400 |
|---|---|---|
| committer | holyfoot@mysql.com <> | 2005-11-03 20:58:43 +0400 |
| commit | 1d8243c8edf0412706266bb9682953029d0bac61 (patch) | |
| tree | 83a4024538d8e3695d5a25ca49482ea56fb9373a /mysql-test | |
| parent | a8b38c1d5a5fae96c9ae37ad0c7692122aa85f23 (diff) | |
| parent | 2940a338c55bf8902b890fd27d184c3b0e4923b8 (diff) | |
| download | mariadb-git-1d8243c8edf0412706266bb9682953029d0bac61.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 2133043a587..62c2b9014c3 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -223,10 +223,10 @@ MYSQL_MANAGER_USER=root # number is to be used, 0 - 16 or similar. # if [ -n "$MTR_BUILD_THREAD" ] ; then - MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 40 + 8120` + MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000` MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2` - SLAVE_MYPORT=`expr $MASTER_MYPORT + 16` - NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24` + SLAVE_MYPORT=`expr $MASTER_MYPORT + 3` + NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4` echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" echo "Using MASTER_MYPORT = $MASTER_MYPORT" diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index eedf4b30e73..5d010235d97 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -16,3 +16,4 @@ rpl_until : Unstable test case, bug#12429 rpl_deadlock : Unstable test case, bug#12429 kill : Unstable test case, bug#9712 archive_gis : The test fails on 32bit Linux +ctype_cp932_binlog : The test is not ready yet. hf will complete shortly |