bk commit into 5.0 tree (iggy:1.2330) BUG#19799

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy 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, 2006-11-22 01:27:06-05:00, iggy@stripped +2 -0
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Use more appropriate test case.

  mysql-test/r/mysql.result@stripped, 2006-11-22 01:27:03-05:00, iggy@stripped +2 -5
    Bug#19799 delimiter command not working correctly when sourcing a sql file
    - Alt. Result.

  mysql-test/t/mysql_delimiter.sql@stripped, 2006-11-22 01:27:03-05:00, iggy@stripped +2 -1
    Bug#19799 delimiter command not working correctly when sourcing a sql file
    - Alt. Test

# 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:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/bug19799/my50-bug19799

--- 1.23/mysql-test/r/mysql.result	2006-11-22 01:27:10 -05:00
+++ 1.24/mysql-test/r/mysql.result	2006-11-22 01:27:10 -05:00
@@ -36,11 +36,8 @@ Tables_in_test
 t1
 t2
 t3
-Database
-information_schema
-cluster
-mysql
-test
+Tables_in_test
+t1
 _
 Test delimiter : from command line
 a

--- 1.3/mysql-test/t/mysql_delimiter.sql	2006-11-22 01:27:10 -05:00
+++ 1.4/mysql-test/t/mysql_delimiter.sql	2006-11-22 01:27:10 -05:00
@@ -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