Commit 14608592 authored Nov 22, 2006 by unknown

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

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

parents 904e4696 184b37a6

mysql-test/r/mysql.result

+2 −5

Original line number	Diff line number	Diff line
		@@ -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

mysql-test/t/mysql_delimiter.sql

+2 −1

Original line number	Diff line number	Diff line
		@@ -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