diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-03 16:27:20 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-03 16:27:20 +0300 |
| commit | 2529b817b10ca2a970b32c109de43d2229c970e7 (patch) | |
| tree | a4b8a436366c890cbd0ab542240abc59d08dca6f /mysql-test | |
| parent | 32bc9157e586ba6f4ba901168d7014449f3a8e66 (diff) | |
| download | mariadb-git-2529b817b10ca2a970b32c109de43d2229c970e7.tar.gz | |
Added usage of --master-retry-count to make mysql-test-run safer.
Build-tools/Do-compile:
Remove --no-delete
Docs/manual.texi:
Udated IA64 section
mysql-test/mysql-test-run.sh:
Added usage of --master-retry-count
set LD_LIBRARY_PATH
sql/mysqld.cc:
Added master-retry-count (needed by mysql-test-run)
sql/slave.cc:
Added master-retry-count
Don't write same error to log on retry
sql/slave.h:
Added master-retry-count (needed by mysql-test-run)
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 3263494ef66..35b29307895 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 @@ -574,17 +579,18 @@ start_slave() slave_args="--no-defaults $master_info \ --exit-info=256 \ --log-bin=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 \ --core \ --tmpdir=$MYSQL_TMP_DIR \ --language=$LANGUAGE \ --skip-innodb --skip-slave-start \ + --master-retry-count=5 \ $SMALL_SERVER \ $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" if [ x$DO_DDD = x1 ] |