diff options
| author | unknown <antony@ltantony.rdg.cyberkinetica.homeunix.net> | 2004-12-18 15:12:10 +0000 |
|---|---|---|
| committer | unknown <antony@ltantony.rdg.cyberkinetica.homeunix.net> | 2004-12-18 15:12:10 +0000 |
| commit | 02453262bcecf06408382a4cffec162cc0d4d674 (patch) | |
| tree | c553786f19f99a3ccca5eda7e06d7cf8a2773621 /mysql-test/mysql-test-run.sh | |
| parent | 4e8e1ef30d393920da36626d6eb272ceca4b5578 (diff) | |
| parent | 047f7904715c1dcd9fc2ada7052e0237e6e97861 (diff) | |
| download | mariadb-git-02453262bcecf06408382a4cffec162cc0d4d674.tar.gz | |
Merge Bug#7391 from 4.0
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Merge from 4.0
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 426b8b486be..93b1360846a 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -4,6 +4,7 @@ # Slightly updated by Monty # Cleaned up again by Matt # Fixed by Sergei +# List of failed cases (--force) backported from 4.1 by Joerg # :-) #++ @@ -1348,7 +1349,7 @@ run_testcase () result_file="$result_file$RESULT_EXT" fi if [ "$USE_MANAGER" = 1 ] ; then - many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` + many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi if $EXPR "$tname" '<' "$START_FROM" > /dev/null ; then #skip_test $tname |