Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new


mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/trigger-compat.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  "Use local" when merging 5.0 -> 5.1

mysql-test/include/have_outfile.inc

@@ -1,5 +1,5 @@
 -- require r/have_outfile.require
 disable_query_log;
 select load_file(concat(@tmpdir,"/outfile.test"));
---exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test
+--exec rm $MYSQLTEST_VARDIR/tmp/outfile.test
 enable_query_log;

mysql-test/include/sourced.inc

@@ -0,0 +1 @@
+echo here is the sourced script;

mysql-test/include/sourced1.inc

@@ -0,0 +1 @@
+--source include/sourced.inc

mysql-test/include/test_outfile.inc

@@ -1 +1 @@
-eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test"; 
+eval select "Outfile OK" into outfile "$MYSQLTEST_VARDIR/tmp/outfile.test";