bk commit into 5.1 tree (msvensson:1.2250)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-07-29 19:38:46+02:00, msvensson@shellback.(none) +2 -0
  Change faulty delimiter ; to | and remove junk in result file caused by that

  mysql-test/r/sp_notembedded.result@stripped, 2006-07-29 19:38:43+02:00, msvensson@shellback.(none) +1 -2
    Change faulty delimiter ; to | and remove junk in result file caused by that

  mysql-test/t/sp_notembedded.test@stripped, 2006-07-29 19:38:43+02:00, msvensson@shellback.(none) +6 -6
    Change faulty delimiter ; to |

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/my51-mysqltest-new-commands

--- 1.6/mysql-test/r/sp_notembedded.result	2006-07-29 19:38:52 +02:00
+++ 1.7/mysql-test/r/sp_notembedded.result	2006-07-29 19:38:52 +02:00
@@ -76,8 +76,7 @@
 flush query cache|
 delete from t1|
 drop procedure bug3583|
-drop table t1;
-#|
+drop table t1|
 drop procedure if exists bug6807|
 create procedure bug6807()
 begin

--- 1.6/mysql-test/t/sp_notembedded.test	2006-07-29 19:38:52 +02:00
+++ 1.7/mysql-test/t/sp_notembedded.test	2006-07-29 19:38:52 +02:00
@@ -19,11 +19,11 @@
   show grants for 'root'@'localhost';
 end|
 --disable_parsing
-show binlog events;
-show storage engines;
-show master status;
-show slave hosts;
-show slave status;
+show binlog events|
+show storage engines|
+show master status|
+show slave hosts|
+show slave status|
 --enable_parsing
 
 call bug4902()|
@@ -110,7 +110,7 @@
 flush query cache|
 delete from t1|
 drop procedure bug3583|
-drop table t1;
+drop table t1|
 
 #
 # BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY