bk commit into 5.0 tree (gluh:1.2609) BUG#5299

[gluh]

Below is the list of changes that have just been committed into a local
5.0 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:21:51+05:00, gluh@stripped +1 -0
  Bug#5299 Remove SHOW COLUMN TYPES
  result fix

  mysql-test/r/sp.result@stripped, 2008-04-19 22:21:50+05:00, gluh@stripped +5 -0
    result fix

diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2008-02-17 15:37:38 +04:00
+++ b/mysql-test/r/sp.result	2008-04-19 22:21:50 +05:00
@@ -2451,6 +2451,8 @@ show tables like 'foo';
 show variables like 'foo';
 show warnings;
 end|
+Warnings:
+Warning	1287	'SHOW COLUMN TYPES' is deprecated; use 'HELP 'DATA TYPES'' instead
 call bug4902()|
 Charset	Description	Default collation	Maxlen
 Collation	Charset	Id	Default	Compiled	Sortlen
@@ -2503,6 +2505,9 @@ Variable_name	Value
 Tables_in_test (foo)
 Variable_name	Value
 Level	Code	Message
+Warning	1287	'SHOW COLUMN TYPES' is deprecated; use 'HELP 'DATA TYPES'' instead
+Warnings:
+Warning	1287	'SHOW COLUMN TYPES' is deprecated; use 'HELP 'DATA TYPES'' instead
 call bug4902()|
 Charset	Description	Default collation	Maxlen
 Collation	Charset	Id	Default	Compiled	Sortlen