Commit 1a922cda 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 28f61575 0c7d10bd

client/readline.cc

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ char *batch_readline(LINE_BUFFER *line_buff) 
  if (!(pos=intern_read_line(line_buff,&out_length)))

    return 0;

  if (out_length && pos[out_length-1] == '\n')

    out_length--;				/* Remove '\n' */

    if (--out_length && pos[out_length-1] == '\r')  /* Remove '\n' */

      out_length--;                                 /* Remove '\r' */

  line_buff->read_length=out_length;

  pos[out_length]=0;

  return pos;

mysql-test/r/mysql.result

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ Tables_in_test 
t1

t2

t3

Database

information_schema

mysql

test

_

Test delimiter : from command line

a

mysql-test/t/mysql_delimiter.sql

+9 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/mysql_delimiter_19799.sql

0 → 100755
+1 −0
Original line number Diff line number Diff line 
delimiter //