Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup

into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup

mysql-test/t/mysqltest.test

@@ -1037,7 +1037,7 @@ drop table t1;
 --error 1
 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
 # The .out file should be non existent
---exec test ! -e $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test ! -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;