1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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.
This commit is contained in:
unknown
2006-11-21 21:10:02 -05:00
parent e7065e0643
commit 0c7d10bde7
4 changed files with 16 additions and 1 deletions

View File

@@ -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