diff options
author | unknown <monty@hundin.mysql.fi> | 2002-04-26 08:56:28 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-04-26 08:56:28 +0300 |
commit | cacfcb6404da497b14fa8484f15ca3832cce8adb (patch) | |
tree | 7412d050274815c36a164eb72d690b8871014e84 /mysql-test/mysql-test-run.sh | |
parent | 18e6569769a62d8d6e1e50670658aee139960181 (diff) | |
download | mariadb-git-cacfcb6404da497b14fa8484f15ca3832cce8adb.tar.gz |
Portability fixes
myisam/ft_boolean_search.c:
Portability fix
mysql-test/mysql-test-run.sh:
Added slave_net_timeout
mysql-test/r/func_if.result:
Updated results after merge from 3.23
mysql-test/r/func_test.result:
Updated results after merge from 3.23
mysql-test/r/innodb.result:
Updated results after merge from 3.23
mysql-test/r/show_check.result:
Updated results after merge from 3.23
mysql-test/r/variables.result:
Updated results after merge from 3.23
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index efebc5b5c86..7ae89c96169 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -874,6 +874,7 @@ start_slave() --report-host=127.0.0.1 --report-user=root \ --report-port=$slave_port \ --master-retry-count=5 \ + -O slave_net_timeout=10 \ $SMALL_SERVER \ $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" CUR_MYERR=$slave_err |