diff options
| author | monty@work.mysql.com <> | 2001-10-03 18:00:38 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-10-03 18:00:38 +0200 |
| commit | 1805368556e304e77d65fc77d6241192f020374e (patch) | |
| tree | 7ab8c94ae6dc6e53d241dd2b3e1d38454567ac42 /mysql-test | |
| parent | 193ae61fc0ee63dfed758c8623f4ec331efd2374 (diff) | |
| parent | 56d30868a4c43a398f54519115bd1319b0e8d4db (diff) | |
| download | mariadb-git-1805368556e304e77d65fc77d6241192f020374e.tar.gz | |
merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 97767a33687..c535810110d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -113,6 +113,11 @@ SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging RES_SPACE=" " MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \ myisammrg heap sql" +# +# Set LD_LIBRARY_PATH if we are using shared libraries +# +LD_LIBRARY_PATH="$BASEDIR/lib:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH MASTER_RUNNING=0 MASTER_MYPORT=9306 @@ -578,12 +583,12 @@ start_slave() --exit-info=256 \ --log-bin=$MYSQL_TEST_DIR/var/log/slave-bin --log-slave-updates \ + --log=$SLAVE_MYLOG \ --basedir=$MY_BASEDIR \ --datadir=$SLAVE_MYDDIR \ --pid-file=$SLAVE_MYPID \ --port=$SLAVE_MYPORT \ --socket=$SLAVE_MYSOCK \ - --log=$SLAVE_MYLOG \ --character-sets-dir=$CHARSETSDIR \ --default-character-set=$CHARACTER_SET \ --core \ @@ -593,6 +598,7 @@ start_slave() --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \ --report-host=127.0.0.1 --report-user=root \ --report-port=$SLAVE_MYPORT \ + --master-retry-count=5 \ $SMALL_SERVER \ $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" if [ x$DO_DDD = x1 ] |