Commit graph

6 commits

Author SHA1 Message Date
Gleb Shchepa
2c77798c74 back-port from 5.1.
Bug#33812: mysql client incorrectly parsing DELIMITER
      
Remove unnecessary and incorrect code that tried
to pull delimiter commands out of the middle of
statements.
2008-06-24 21:03:17 +05:00
Gleb Shchepa
6eb2e76abd Bug #36244: MySQL CLI doesn't recognize standalone --
as a commentary

mysql client has been modified to interpret EOL after
standalone -- commentary strings like whitespace
character (according to
http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html)


mysql-test/t/mysql_delimiter.sql:
  Added test case for bug #36244.
2008-06-24 19:32:06 +05:00
unknown
1b3f04caa4 Bug#19799 delimiter command not working correctly when sourcing a sql file
- Use more appropriate test case.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Result.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Test
2006-11-22 01:27:06 -05:00
unknown
0c7d10bde7 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.
2006-11-21 21:10:02 -05:00
unknown
d2c97cdee0 Fix 'source' command in mysql client to handle delimiter command
in sourced file properly. (Bug #11523)


client/mysql.cc:
  Rename read_lines() to read_and_execute() and change interface so it
  is clear when we are reading and processing lines interactively versus
  in batch mode or from a file being sourced.
mysql-test/r/mysql.result:
  Add results
mysql-test/t/mysql_delimiter.sql:
  Add new test
mysql-test/t/mysql_delimiter_source.sql:
  New BitKeeper file ``mysql-test/t/mysql_delimiter_source.sql''
2005-08-09 12:17:28 -07:00
unknown
df4d98902a BUG#9879 delimiter command discrepancy (4.1 vs. 5.0, mysql vs. mysqltest)
- Added testcases to test delimiters in 5.0
 - In 5.0 it's allowed to have a up to 16 byte string as delimiter, everything after the delimiter token will be treated as the delimiter. It's even allowed to set delimiter to 'delimiter', ':;' or'MySQL'
2005-05-17 21:14:01 +02:00