Merge pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232

into  pilot.(none):/data/msvensson/mysql/wl3232/my51-wl3232


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

mysql-test/r/mysqltest.result

@@ -339,6 +339,7 @@ here is the sourced script
 
 In loop
 here is the sourced script
+here is the sourced script
 mysqltest: At line 1: Missing argument to sleep
 mysqltest: At line 1: Missing argument to real_sleep
 mysqltest: At line 1: Invalid argument to sleep "abc"

mysql-test/t/mysqltest.test

@@ -835,6 +835,10 @@ while ($num)
 }
 --enable_abort_on_error
 --enable_query_log
+
+# Test source $variable/<filename>
+--source $MYSQLTEST_VARDIR/tmp/sourced.inc
+
 --remove_file $MYSQLTEST_VARDIR/tmp/sourced.inc
 
 # ----------------------------------------------------------------------------