bk commit into 5.0 tree (msvensson:1.2022)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2022 06/02/16 22:10:25 msvensson@neptunus.(none) +2 -0
  Use the tmp dir of MYSQLTEST_VARDIR 

  mysql-test/t/sp.test
    1.169 06/02/16 22:10:21 msvensson@neptunus.(none) +6 -6
    Use the tmp dir of MYSQLTEST_VARDIR 

  mysql-test/r/sp.result
    1.180 06/02/16 22:10:21 msvensson@neptunus.(none) +2 -2
    Use the tmp dir of MYSQLTEST_VARDIR 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace

--- 1.179/mysql-test/r/sp.result	2006-01-12 23:56:47 +01:00
+++ 1.180/mysql-test/r/sp.result	2006-02-16 22:10:21 +01:00
@@ -539,7 +539,7 @@
 create procedure into_outfile(x char(16), y int)
 begin
 insert into test.t1 values (x, y);
-select * into outfile "/tmp/spout" from test.t1;
+select * into outfile "../tmp/spout" from test.t1;
 insert into test.t1 values (concat(x, "2"), y+2);
 end|
 call into_outfile("ofile", 1)|
@@ -549,7 +549,7 @@
 create procedure into_dumpfile(x char(16), y int)
 begin
 insert into test.t1 values (x, y);
-select * into dumpfile "/tmp/spdump" from test.t1 limit 1;
+select * into dumpfile "../tmp/spdump" from test.t1 limit 1;
 insert into test.t1 values (concat(x, "2"), y+2);
 end|
 call into_dumpfile("dfile", 1)|

--- 1.168/mysql-test/t/sp.test	2006-01-12 23:56:47 +01:00
+++ 1.169/mysql-test/t/sp.test	2006-02-16 22:10:21 +01:00
@@ -702,13 +702,13 @@
 create procedure into_outfile(x char(16), y int)
 begin
   insert into test.t1 values (x, y);
-  select * into outfile "/tmp/spout" from test.t1;
+  select * into outfile "../tmp/spout" from test.t1;
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 
-system rm -f /tmp/spout|
+--system rm -f $MYSQLTEST_VARDIR/tmp/spout
 call into_outfile("ofile", 1)|
-system rm -f /tmp/spout|
+--system rm -f $MYSQLTEST_VARDIR/tmp/spout
 delete from t1|
 drop procedure into_outfile|
 
@@ -718,13 +718,13 @@
 create procedure into_dumpfile(x char(16), y int)
 begin
   insert into test.t1 values (x, y);
-  select * into dumpfile "/tmp/spdump" from test.t1 limit 1;
+  select * into dumpfile "../tmp/spdump" from test.t1 limit 1;
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 
-system rm -f /tmp/spdump|
+--system rm -f $MYSQLTEST_VARDIR/tmp/spdump
 call into_dumpfile("dfile", 1)|
-system rm -f /tmp/spdump|
+--system rm -f $MYSQLTEST_VARDIR/tmp/spdump
 delete from t1|
 drop procedure into_dumpfile|