Commit 184b37a6 authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


mysql-test/r/mysql.result:
  Auto merged
parents 560bc0ea 1b3f04ca

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