bk commit into 5.0 tree (joerg:1.2031)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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.2031 06/01/18 16:45:57 joerg@stripped +2 -0
  Work around a crash of test "sp" (like #15866 in the bug DB). No fix of that bug!

  mysql-test/t/sp_trans.test
    1.7 06/01/18 16:45:50 joerg@stripped +1 -1
    Test "sp" sometimes crashes (for example, see #15866 in the bug DB), then it may leave table "fib".
    This causes later tests to "fail" due to the additional table in the "show" output.
    Drop the table, just in case, to work around that problem.

  mysql-test/r/sp_trans.result
    1.7 06/01/18 16:45:50 joerg@stripped +1 -1
    Adapt the result, as a consequence of the corresponding test change.

# 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:	joerg
# Host:	trift2.
# Root:	/M50/push-5.0

--- 1.6/mysql-test/r/sp_trans.result	2005-11-23 11:56:45 +01:00
+++ 1.7/mysql-test/r/sp_trans.result	2006-01-18 16:45:50 +01:00
@@ -1,4 +1,4 @@
-drop table if exists t1, t2;
+drop table if exists t1, t2, fib;
 drop procedure if exists bug8850|
 create table t1 (a int) engine=innodb|
 create procedure bug8850()

--- 1.6/mysql-test/t/sp_trans.test	2005-11-23 11:56:46 +01:00
+++ 1.7/mysql-test/t/sp_trans.test	2006-01-18 16:45:50 +01:00
@@ -5,7 +5,7 @@
 -- source include/have_innodb.inc
 
 --disable_warnings
-drop table if exists t1, t2;
+drop table if exists t1, t2, fib;
 --enable_warnings
 
 delimiter |;