diff options
| author | sasha@mysql.sashanet.com <> | 2001-04-17 23:06:00 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-04-17 23:06:00 -0600 |
| commit | 858867fa656001558cdd4fccd438fd6ea5b55728 (patch) | |
| tree | 9ce77045dc2a3ce671c9c72e3813b1b3b4b35e49 /mysql-test | |
| parent | 77fb94a21201484bbee76b51f78b9b1f17bb667e (diff) | |
| download | mariadb-git-858867fa656001558cdd4fccd438fd6ea5b55728.tar.gz | |
lient/mysqltest.c
added support for alphanumeric variables - import MASTER_MYPORT and
SLAVE_MYPORT from the environment
mysql-test/mysql-test-run.sh
export MASTER_MYPORT and SLAVE_MYPORT for mysqltest
mysql-test/t/rpl000015.test
use MASTER_MYPORT
mysql-test/t/rpl000016.test
use MASTER_MYPORT
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl000015.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl000016.test | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index c42485c753f..ccf1aa81270 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -202,6 +202,9 @@ SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err" SMALL_SERVER="-O key_buffer_size=1M -O sort_buffer=256K -O max_heap_table_size=1M" +export MASTER_MYPORT +export SLAVE_MYPORT + if [ x$SOURCE_DIST = x1 ] ; then MY_BASEDIR=$MYSQL_TEST_DIR else diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index 1003c355f15..825d1317bbc 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -10,8 +10,8 @@ reset slave; show slave status; change master to master_host='127.0.0.1'; show slave status; -change master to master_host='127.0.0.1',master_user='root', - master_password='',master_port=9306; +eval change master to master_host='127.0.0.1',master_user='root', + master_password='',master_port=$MASTER_MYPORT; show slave status; slave start; sync_with_master; diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index 9161d2e4734..a1450089898 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -7,9 +7,11 @@ connection slave; !slave start; system chmod 600 var/slave-data/master.info; !slave start; -!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; +!eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, + master_user='root'; reset slave; -!change master to master_host='127.0.0.1',master_port=9306,master_user='root'; +eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, + master_user='root'; connection master; reset master; connection slave; |