bk commit into 5.1 tree (gluh:1.2579)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh.  When gluh 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, 2008-04-19 22:25:44+05:00, gluh@stripped +1 -0
  result fix

  mysql-test/r/sp.result@stripped, 2008-04-19 22:25:43+05:00, gluh@stripped +2 -0
    result fix

diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2008-04-19 22:22:52 +05:00
+++ b/mysql-test/r/sp.result	2008-04-19 22:25:43 +05:00
@@ -2452,6 +2452,8 @@ show tables like 'foo';
 show variables like 'foo';
 show warnings;
 end|
+Warnings:
+Warning	1287	The syntax 'SHOW COLUMN TYPES' is deprecated and will be removed in MySQL 6.0. Please use HELP 'DATA TYPES' instead
 call bug4902()|
 Charset	Description	Default collation	Maxlen
 Collation	Charset	Id	Default	Compiled	Sortlen