Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
14608592 · unknown · 904e4696 · 184b37a6 · 14608592 · 14608592
Commit 14608592 authored Nov 22, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

mysql-test/r/mysql.result mysql-test/r/mysql.result +2 -5

mysql-test/t/mysql_delimiter.sql mysql-test/t/mysql_delimiter.sql +2 -1

No files found.
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -36,11 +36,8 @@ Tables_in_test
 t1
 t2
 t3
-Database
+Tables_in_test
-information_schema
+t1
-cluster
-mysql
-test
 _
 Test delimiter : from command line
 a

--- a/mysql-test/t/mysql_delimiter.sql
+++ b/mysql-test/t/mysql_delimiter.sql
@@ -56,5 +56,6 @@ delimiter ; # Reset delimiter
 #             with Windows style line endings.
 #
 source t/mysql_delimiter_19799.sql
-show databases//
+use test//
+show tables//
 delimiter ; # Reset delimiter