From 0c7d10bde7378e101e6ce4c0caa818fb0688f3db Mon Sep 17 00:00:00 2001
From: unknown <iggy@rolltop.ignatz42.dyndns.org>
Date: Tue, 21 Nov 2006 21:10:02 -0500
Subject: Bug#19799 delimiter command not working correctly when sourcing a sql
 file - Client side readline functions unconditionally search for Unix '\n'
 line endings. In this case, the delimiter statement was set to '//\r' instead
 of the intended '//'. When removing the '\n' check for and remove preceeding
 '\r' character as well.

client/readline.cc:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - When removing the '\n' character, check for and remove preceeding '\r'
  character as well.
mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Results.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Tests.
mysql-test/t/mysql_delimiter_19799.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - File containing delimiter statement followed by '\r\n' line ending.
---
 mysql-test/t/mysql_delimiter.sql | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'mysql-test/t/mysql_delimiter.sql')

diff --git a/mysql-test/t/mysql_delimiter.sql b/mysql-test/t/mysql_delimiter.sql
index fa80c980b29..67075091c01 100644
--- a/mysql-test/t/mysql_delimiter.sql
+++ b/mysql-test/t/mysql_delimiter.sql
@@ -49,3 +49,12 @@ delimiter ; # Reset delimiter
 # Bug #11523: \d works differently than delimiter
 #
 source t/mysql_delimiter_source.sql
+delimiter ; # Reset delimiter
+
+#
+# Bug #19799: delimiter command not working correctly when sourcing a sql file
+#             with Windows style line endings.
+#
+source t/mysql_delimiter_19799.sql
+show databases//
+delimiter ; # Reset delimiter
-- 
cgit v1.2.1

