bk commit into 5.1 tree (msvensson:1.2086)

[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
  1.2086 06/02/07 19:59:19 msvensson@neptunus.(none) +2 -0
  Removed extra "drop view v1"

  mysql-test/t/sp-prelocking.test
    1.5 06/02/07 19:59:14 msvensson@neptunus.(none) +0 -1
    One drop too many

  mysql-test/r/sp-prelocking.result
    1.5 06/02/07 19:59:13 msvensson@neptunus.(none) +0 -1
    Update test result

# 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/mysql-5.1-new

--- 1.4/mysql-test/r/sp-prelocking.result	2006-02-07 17:18:10 +01:00
+++ 1.5/mysql-test/r/sp-prelocking.result	2006-02-07 19:59:13 +01:00
@@ -214,4 +214,3 @@
 drop function f2;
 drop function f3;
 drop procedure sp1;
-drop view v1;

--- 1.4/mysql-test/t/sp-prelocking.test	2006-02-07 17:18:12 +01:00
+++ 1.5/mysql-test/t/sp-prelocking.test	2006-02-07 19:59:14 +01:00
@@ -240,4 +240,3 @@
 drop function f2;
 drop function f3;
 drop procedure sp1;
-drop view v1;