bk commit into 5.1 tree (jimw:1.1959)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.1959 05/12/12 14:53:47 jimw@stripped +1 -0
  Fix sp.result after merge

  mysql-test/r/sp.result
    1.177 05/12/12 14:53:42 jimw@stripped +0 -9
    Update results (t3 does exist here)

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean

--- 1.176/mysql-test/r/sp.result	2005-12-12 11:55:12 -08:00
+++ 1.177/mysql-test/r/sp.result	2005-12-12 14:53:42 -08:00
@@ -4203,11 +4203,8 @@
 test.t3	analyze	status	Table is already up to date
 test.v1	analyze	error	'test.v1' is not BASE TABLE
 Warnings:
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
 call bug13012()|
 Table	Op	Msg_type	Msg_text
@@ -4226,11 +4223,8 @@
 test.t3	analyze	status	Table is already up to date
 test.v1	analyze	error	'test.v1' is not BASE TABLE
 Warnings:
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
 call bug13012()|
 Table	Op	Msg_type	Msg_text
@@ -4249,11 +4243,8 @@
 test.t3	analyze	status	Table is already up to date
 test.v1	analyze	error	'test.v1' is not BASE TABLE
 Warnings:
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
-Error	1146	Table 'test.t3' doesn't exist
 Error	1347	'test.v1' is not BASE TABLE
 drop procedure bug13012|
 drop view v1;