bzr push into mysql-trunk branch (vinay.fisrekar:4877 to 4878)

[Vinay Fisrekar]

 4878 Vinay Fisrekar	2013-01-10
      Fix windows case. Add ';' based on platform.

    modified:
      mysql-test/suite/innodb/t/innodb_wl6560_1.test
 4877 Krunal Bauskar	2013-01-09
      - WL#6560: corrected gcov failured

    modified:
      mysql-test/suite/innodb/t/innodb_wl6560.test
=== modified file 'mysql-test/suite/innodb/t/innodb_wl6560_1.test'
--- a/mysql-test/suite/innodb/t/innodb_wl6560_1.test	2013-01-09 09:20:51 +0000
+++ b/mysql-test/suite/innodb/t/innodb_wl6560_1.test	2013-01-10 09:56:31 +0000
@@ -333,16 +333,21 @@ SELECT a,b,RIGHT(c,10),RIGHT(d,10),RIGHT
 
 --mkdir $MYSQLTEST_VARDIR/tmp/testdir1
 --mkdir $MYSQLTEST_VARDIR/tmp/testdir2
-
+let $platform_windows = `select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows")`;
 --echo # restart server
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --shutdown_server
 --source include/wait_until_disconnected.inc
 --echo # list_file ,no files expected - temp tablespace cleared on stopping server
 --list_files $MYSQL_TMP_DIR/ ibtmp1*
-#
-# Write file to make mysql-test-run.pl start up the server again
+
 --exec echo "restart: --tmpdir=$MYSQLTEST_VARDIR/tmp/testdir1/:$MYSQLTEST_VARDIR/tmp/testdir2 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# # Write file to make mysql-test-run.pl start up the server again
+if ($platform_windows!=0) {
+# write ';' instead of ':' for windows
+--exec echo "restart: --tmpdir=$MYSQLTEST_VARDIR/tmp/testdir1/;$MYSQLTEST_VARDIR/tmp/testdir2 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+}
+
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 --disable_reconnect

No bundle (reason: useless for push emails).