bzr push into mysql-trunk branch (horst.hunger:3498 to 3499)

[horst.hunger]

 3499 horst.hunger@stripped	2011-11-18
      Fixed 2 bugs: in regluar expression and call od validator on Windows.

    modified:
      mysql-test/include/explain_utils.inc
 3498 horst.hunger@stripped	2011-11-17
      Fixed wrong socket parameter in mysql call.

    modified:
      mysql-test/include/explain_utils.inc
=== modified file 'mysql-test/include/explain_utils.inc'
--- a/mysql-test/include/explain_utils.inc	2011-11-17 08:15:12 +0000
+++ b/mysql-test/include/explain_utils.inc	2011-11-18 11:35:11 +0000
@@ -76,8 +76,8 @@ if ($validation) {
 --disable_query_log
 --replace_result $MASTER_MYSOCK MASTER_MYSOCK
 --exec $MYSQL -S $MASTER_MYSOCK -u root -r test -e "EXPLAIN FORMAT=JSON $query;" > $MYSQLTEST_VARDIR/tmp/explain.json
---replace_regex  /[-]*// /FILE.[\/\\_\.0-9A-Za-z]*/Validation:/
---exec python suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json
+--replace_regex  /[-]*// /FILE.[\/\\:_\.0-9A-Za-z]*/Validation:/
+--exec python $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json 
 --remove_file '$MYSQLTEST_VARDIR/tmp/explain.json'
 --enable_query_log
 }
@@ -112,7 +112,7 @@ if ($validation) {
 --replace_result $MASTER_MYSOCK MASTER_MYSOCK
 --exec $MYSQL -S $MASTER_MYSOCK -u root -r test -e "EXPLAIN FORMAT=JSON $select;" > $MYSQLTEST_VARDIR/tmp/explain.json
 --replace_regex  /[-]*// /FILE.[\/\\:_\.0-9A-Za-z]*/Validation:/
---exec python suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json 
+--exec python $MYSQL_TEST_DIR/suite/opt_trace/validate_json.py $MYSQLTEST_VARDIR/tmp/explain.json 
 --remove_file '$MYSQLTEST_VARDIR/tmp/explain.json'
 --enable_query_log
 }

No bundle (reason: useless for push emails).