bk commit into 5.1 tree (aelkin:1.2391) BUG#19728

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2391 06/05/12 12:21:08 aelkin@stripped +1 -0
  Bug#19728: Test mysqldump failure
  
  regex is fixed for windows.

  mysql-test/t/mysqldump.test
    1.97 06/05/12 12:21:02 aelkin@stripped +1 -1
    Windows' suffix is accounted.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win

--- 1.96/mysql-test/t/mysqldump.test	2006-05-10 16:49:29 +03:00
+++ 1.97/mysql-test/t/mysqldump.test	2006-05-12 12:21:02 +03:00
@@ -1186,7 +1186,7 @@
 
 # Drop table "words" and run with threads, should fail
 drop table words;
---replace_regex /.*mysqlimport/mysql-import/
+--replace_regex /.*mysqlimport(.exe)*/mysql-import/
 --error 1
 --exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data_ln/words.dat $MYSQLTEST_VARDIR/std_data_ln/words2.dat 2>&1