summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysql.result
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrectly-committed changes to mysql.resultJim Winstead2009-07-311-2/+2
|
* Merge bug fix.Jim Winstead2009-07-301-3/+25
|\
| * The handling of NUL bytes in column data in the various output formatsJim Winstead2009-07-141-3/+25
| | | | | | | | | | supported by the mysql client was inconsistent. (Bug #28203)
* | Merge in bug fixes for client toolsJim Winstead2009-07-141-18/+18
|\ \ | |/
| * The mysql command-line client would include superfluous spaces at the end ofJim Winstead2009-05-201-18/+18
| | | | | | | | | | some result set lines. (Bug #29622)
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-281-1/+1
|\ \
| * | test case fixSergey Glukhov2009-05-281-1/+1
| | |
* | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-281-0/+1
|\ \ \ | |/ /
| * | Bug#37268 'binary' character set makes CLI-internal commands case sensitiveSergey Glukhov2009-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix is to use case insensitive collation for mysql client command search. client/mysql.cc: The fix is to use case insensitive collation for mysql client command search. mysql-test/r/mysql.result: test result mysql-test/t/mysql.test: test case
* | | Merge from 5.0-bugteamJim Winstead2009-05-131-0/+6
|\ \ \ | |/ / | | / | |/ |/|
| * Fix support for -i (--ignore-spaces) in the mysql command line application,Jim Winstead2009-05-071-0/+6
| | | | | | | | | | which didn't actually do anything. (Bug #39101)
* | Bug #27884: mysql --html does not quote HTML special characters in outputJim Winstead2009-04-281-0/+1
| | | | | | | | | | Fix encoding of field values and names in HTML output from mysql client.
* | Manuel merge.Alexey Kopytov2009-03-241-9/+0
|\ \
| * | Fix for bug #43801: mysql.test takes too long, fails due to Alexey Kopytov2009-03-241-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expired timeout on debx86-b in PB Moved the resource-intensive test case for bug #41486 into a separate test file to reduce execution time for mysql.test. mysql-test/include/wait_until_disconnected.inc: Used in mysql-bug41486.test. mysql-test/r/mysql-bug41486.result: Moved the resource-intensive test case for bug #41486 into a separate test file to reduce execution time for mysql.test. mysql-test/r/mysql.result: Moved the resource-intensive test case for bug #41486 into a separate test file to reduce execution time for mysql.test. mysql-test/t/mysql-bug41486.test: Moved the resource-intensive test case for bug #41486 into a separate test file to reduce execution time for mysql.test. mysql-test/t/mysql.test: Moved the resource-intensive test case for bug #41486 into a separate test file to reduce execution time for mysql.test.
* | | Automerge.Alexey Kopytov2009-03-191-2/+0
|\ \ \ | |/ /
| * | Fixed test failures in 5.1/6.0 introduced by the patchAlexey Kopytov2009-03-191-2/+0
| | | | | | | | | | | | | | | | | | for bug #41486. Session max_allowed_packet is read-only as of MySQL 5.1.31. In addition, the global variable now has no effect on the current session.
* | | Manual merge.Alexey Kopytov2009-03-181-0/+11
|\ \ \ | |/ /
| * | Fix for bug#41486: extra character appears in BLOB for every Alexey Kopytov2009-03-181-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~40Mb after mysqldump/import When the input string exceeds the maximum allowed size for the internal buffer, batch_readline() returns a truncated string. Since there was no way for a caller to determine whether the string was truncated or not, the command line client assumed batch_readline() to always return the whole input string and appended a newline character. This resulted in garbled data when importing dumps containing strings longer than the maximum input buffer size. Fixed by adding a flag to the batch_readline() interface to signal a truncated string to the caller. Other minor problems fixed during patch implementation: - The maximum allowed buffer size for batch_readline() was set up depending on the client's max_allowed_packet value. It does not actully make any sense, as those variables are not related. The input buffer size limit is now always set to 1 MB. - fill_buffer() did not always set the EOF flag. - The input buffer could actually grow twice as the specified limit due to insufficient checks in intern_read_line(). client/my_readline.h: Changed the interface of batch_readline(). client/mysql.cc: Honor the truncated flag returned by batch_readline() and do not append the newline character if it was set. Since we can't change the interfaces for readline()/fgets() used in the interactive mode, always assume the returned string was not truncated. In addition, always set the batch_readline() internal buffer to 1 MB, independently from the client's max_allowed_packet. client/readline.cc: Added the 'truncated' argument do batch_readline() to signal truncated string to a caller. Fixed fill_buffer() to set the EOF flag correctly. Fixed checks in intern_read_line() to not allow the internal buffer grow past the specified limit. mysql-test/r/mysql.result: Added a test case for bug #41486. mysql-test/t/mysql.test: Added a test case for bug #41486.
| * Bug #31060: MySQL CLI parser bug 2Georgi Kodinov2009-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a problem when a DELIMITER COMMAND is not the first command on the line. I this case an extra line feed was added to the glob buffer and this was causing subsequent attempts to enter this delimiter to fail. Fixed by not adding a new line to the glob buffer if the command being added is a DELIMITER client/mysql.cc: Bug #31060: Don't add a new line if DELIMTER is added to the glob buffer mysql-test/r/mysql.result: Bug #31060: test case mysql-test/t/mysql.test: Bug #31060: test case
* | merged bug 31060 to 5.1-bugteamGeorgi Kodinov2009-02-251-0/+4
|\ \
| * | Bug #31060: MySQL CLI parser bug 2Georgi Kodinov2009-02-241-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a problem when a DELIMITER COMMAND is not the first command on the line. I this case an extra line feed was added to the glob buffer and this was causing subsequent attempts to enter this delimiter to fail. Fixed by not adding a new line to the glob buffer if the command being added is a DELIMITER client/mysql.cc: Bug #31060: Don't add a new line if DELIMTER is added to the glob buffer mysql-test/r/mysql.result: Bug #31060: test case mysql-test/t/mysql.test: Bug #31060: test case
* | merged 41437 to 5.1-bugteamGeorgi Kodinov2009-01-091-0/+2
|\ \ | |/
| * Bug #41437: Value stored in 'case' lacks charset, causes segfaultGeorgi Kodinov2009-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When substituting system constant functions with a constant result the server was not expecting that the function may return NULL. Fixed by checking for NULL and returning Item_null (in the relevant collation) if the result of the system constant function was NULL. mysql-test/r/mysql.result: Bug #41437: test case mysql-test/t/mysql.test: Bug #41437: test case. Relies on database() returning NULL if no database is selected. sql/item_strfunc.cc: Bug #41437: Check for NULL result on evaluating the system constant function and return a constant NULL item.
* | Merge fix for Bug 33812 from 5.0-bugteam.Chad MILLER2008-12-111-0/+6
|\ \ | |/
| * Bug#33812: mysql client incorrectly parsing DELIMITERChad MILLER2008-12-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix parsing of mysql client commands, especially in relation to single-line comments when --comments was specified. This is a little tricky, because we need to allow single-line comments in the middle of statements, but we don't want to allow client commands in the middle of statements. So in comment-preservation mode, we go ahead and send single-line comments to the server immediately when we encounter them on their own. This is still slightly flawed, in that it does not handle a single-line comment with leading spaces, followed by a client-side command when --comment has been enabled. But this isn't a new problem, and it is quite an edge condition. Fixing it would require a more extensive overall of how the mysql client parses commands.
| * Bug 38158: mysql client regression, can't read dump filesGeorgi Kodinov2008-07-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Revert the fix for bug 33812 - fixed a win32 warning client/mysql.cc: revert the fix for bug 33812 mysql-test/r/mysql.result: revert the fix for bug 33812 mysql-test/t/mysql_delimiter.sql: revert the fix for bug 33812 mysys/default.c: fixed a win32 warning
| * back-port from 5.1.Gleb Shchepa2008-06-241-0/+2
| | | | | | | | | | | | | | | | Bug#33812: mysql client incorrectly parsing DELIMITER Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements.
* | Bug#25146 Some warnings/errors not shown when using --show-warningsunknown2007-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Additional patch to fix compiler warnings client/mysql.cc: Initialize warnings to 0 to avid compiler warning Call 'print_warnings' also when error occured mysql-test/r/mysql.result: Change test to make is possible to see that second set of warnings are from second invocation of mysql mysql-test/t/mysql.test: Change test to make is possible to see that second set of warnings are from second invocation of mysql
* | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2007-11-211-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge client/mysql.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/suite/ndb/r/ndb_dd_basic.result: Auto merged mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Auto merged mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Auto merged mysql-test/t/ctype_uca.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/subselect.test: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/innodb.result: Manual merge.
| * \ Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0unknown2007-10-041-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge client/mysql.cc: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_class.h: conflicting hunk is for log.h
| | * Bug#29323 mysql client only accetps ANSI encoded filesunknown2007-10-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: ignore BOM marker in the first line. client/mysql.cc: Skip BOM marker in the very first line. mysql-test/r/mysql.result: Adding test mysql-test/t/mysql.test: Adding test
* | | Bug #25146: Some warnings/errors not shown when using --show-warningsunknown2007-11-201-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In several cases, an error when processing the query would cause mysql to return to the top level without printing warnings. Fix is to always print any available warnings before returning to the top level. client/mysql.cc: In com_go(), ensure that warnings are printed even if an error occurred when processing the query. Before this patch, an error in several places would return to the top level without printing associated warnings. Attempt to avoid printing the warning, though, if it's a duplicate of mysql_error() for the connection handle. mysql-test/r/mysql.result: Add test for bug 25146 mysql-test/t/mysql.test: Add test for bug 25146
* | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-09-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_collate.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/default.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/show_check.result: manual merge mysql-test/t/information_schema.test: manual merge sql/sql_show.cc: manual merge
| * Bug#27747 database metadata doesn't return sufficient column default infounknown2007-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added get_field_default_value() function which obtains default value from the field (used in store_create_info() & get_schema_column_record() functions) mysql-test/r/alter_table.result: result fix mysql-test/r/create.result: result fix mysql-test/r/ctype_collate.result: result fix mysql-test/r/ctype_recoding.result: result fix mysql-test/r/default.result: result fix mysql-test/r/gis.result: result fix mysql-test/r/grant.result: result fix mysql-test/r/information_schema.result: result fix mysql-test/r/key.result: result fix mysql-test/r/mysql.result: result fix mysql-test/r/ps_1general.result: result fix mysql-test/r/show_check.result: result fix mysql-test/r/sp.result: result fix mysql-test/r/type_enum.result: result fix mysql-test/r/type_ranges.result: result fix mysql-test/t/information_schema.test: test case
* | Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164unknown2007-08-301-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into polly.(none):/home/kaa/src/bug30164/my51-bug30164 client/mysql.cc: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged
| * Bug #30164: Using client side macro inside server side comments generates ↵unknown2007-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | broken queries Problem: In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded. Fix: If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter). This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting: - Nested server-side and/or client-side comments are not supported by mysql.cc - Using client-side macros in multi-line server-side comments is not supported - All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server). client/mysql.cc: If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro. mysql-test/r/mysql.result: Added a test case for bug #30164. mysql-test/t/mysql.test: Added a test case for bug #30164.
* | Bug#29903 The CMake build method does not produce the embedded library.unknown2007-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | - GCov fix. mysql-test/r/mysql.result: Bug#29903 The CMake build method does not produce the embedded library. -Result mysql-test/t/mysql.test: Bug#29903 The CMake build method does not produce the embedded library. - Test for warning message.
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-231-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint Makefile.am: Auto merged client/mysql_upgrade.c: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged sql/mysql_priv.h: Auto merged tests/mysql_client_test.c: Auto merged
| * Update test to work also when --pager does not exist in "mysql"unknown2007-04-231-2/+0
| |
* | Merge mysql.com:/home/ram/work/b26851/b26851.5.0unknown2007-04-191-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b26851/b26851.5.1 client/mysql.cc: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/t/mysql.test: Auto merged
| * Fix for unknown2007-04-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow Using strmov() to copy an argument may cause overflow if the argument's length is bigger than the buffer: use strmake instead. Also, we have to encrease the error message buffer size to fit the longest message. client/mysql.cc: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - use strmake() instead of strmov() to avoid buffer overflow. mysql-test/r/mysql.result: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - test result. mysql-test/t/mysql.test: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - test case. mysys/charset.c: Fix for bug #27715: mysqld --character-sets-dir buffer overflow bug ##26851: Mysql Client --pager Buffer Overflow - encrease error message buffer size to fit the (possible) longest message.
* | Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with ↵unknown2007-04-031-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-byte client/mysqldump.c: fixed typo include/mysql_com.h: added new constants SYSTEM_CHARSET_MBMAXLEN, NAME_CHAR_LEN, USERNAME_CHAR_LENGTH increased NAME_LEN, USERNAME_LENGTH mysql-test/r/create.result: result fix mysql-test/r/grant.result: result fix mysql-test/r/mysql.result: result fix mysql-test/r/sp.result: result fix mysql-test/t/create.test: test case mysql-test/t/grant.test: test case sql/events.cc: NAME_LEN is replaced with NAME_CHAR_LEN sql/item_strfunc.h: fixed calculation of max_length sql/mysql_priv.h: check_string_length function is replaced with check_string_byte_length added new function check_string_char_length sql/sp.cc: NAME_LEN is replaced with NAME_CHAR_LEN sql/sp_head.cc: NAME_LEN is replaced with NAME_CHAR_LEN sql/sp_head.h: changed parameter of 'check_routine_name' function sql/sql_class.cc: NAME_LEN is replaced with NAME_CHAR_LEN sql/share/errmsg.txt: increased argument lengths according to new constants sql/sql_parse.cc: removed unnecessary checks added function 'check_string_char_length' sql/sql_plugin.cc: check that name is not longer than NAME_CHAR_LEN symbols sql/sql_show.cc: NAME_LEN is replaced with NAME_CHAR_LEN sql/sql_table.cc: check that key name is not longer than NAME_LEN symbols sql/sql_udf.cc: check that udf name is not longer than NAME_CHAR_LEN symbols sql/sql_yacc.yy: check that user name is not longer than USERNAME_CHAR_LENGTH symbols sql/table.cc: check that db or table or column name is not longer than NAME_LEN symbols storage/innobase/handler/ha_innodb.cc: removed unnecessary multiplication tests/mysql_client_test.c: NAME_LEN is replaced with NAME_CHAR_LEN
* Bug#18743: Several test cases fails if "classic" configuration in 5.0unknown2007-02-191-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are: - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test" - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test" mysql-test/r/ctype_cp932.result: Moved cp932-specific test case from mysql.test mysql-test/r/innodb.result: Moved ucs2-specific test cases to innodb-ucs2.test mysql-test/r/mysql.result: Move cp932-specific test cases to ctype_cp932.test mysql-test/r/mysqlbinlog.result: Moved cp932-specific test case to mysqlbinlog-cp932.test mysql-test/r/sp.result: Moved ucs2-specific test case to sp-ucs2.test mysql-test/t/ctype_cp932.test: Moved cp932-specific test case from mysql.test mysql-test/t/ctype_ucs2_def-master.opt: Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server mysql-test/t/ctype_ucs2_def.test: Added requirement for ucs2 in the server mysql-test/t/innodb.test: Moved ucs2-specific test cases to innodb-ucs2.test mysql-test/t/mysql.test: Move cp932-specific test cases to ctype_cp932.test mysql-test/t/mysqlbinlog.test: Moved cp932-specific test case to mysqlbinlog-cp932.test mysql-test/t/sp.test: Moved ucs2-specific test case to sp-ucs2.test sql/mysqld.cc: Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled: mysqld --default-character-set=ucs2,latin1 The first available character set will be chosen. mysql-test/r/innodb-ucs2.result: New BitKeeper file ``mysql-test/r/innodb-ucs2.result'' mysql-test/r/mysqlbinlog-cp932.result: New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result'' mysql-test/r/sp-ucs2.result: New BitKeeper file ``mysql-test/r/sp-ucs2.result'' mysql-test/t/innodb-ucs2.test: New BitKeeper file ``mysql-test/t/innodb-ucs2.test'' mysql-test/t/mysqlbinlog-cp932.test: New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test'' mysql-test/t/sp-ucs2.test: New BitKeeper file ``mysql-test/t/sp-ucs2.test''
* Revert charset breakage.unknown2006-11-281-7/+7
|
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-271-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged mysql-test/r/func_misc.result: Auto merged sql/item_func.h: Auto merged mysql-test/r/mysql.result: Manual merge mysql-test/t/mysql.test: Manual merge
| * Fix for Bug #21412 (client allows DELIMITER with backslash character)unknown2006-10-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/t/tmp.test mysql-test/r/tmp.result client/tmp.diff to the ignore list client/mysql.cc: Fix for Bug #21412 (client allows DELIMITER with backslash) mysql-test/r/mysql.result: Added test case for Bug #21412 mysql-test/t/mysql.test: Added test case for Bug #21412
* | Bug#19799 delimiter command not working correctly when sourcing a sql fileunknown2006-11-221-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Bug#19799 delimiter command not working correctly when sourcing a sql fileunknown2006-11-221-0/+1
| | | | | | | | | | | | | | | | | | - Post Merge Fix. mysql-test/r/mysql.result: Bug#19799 delimiter command not working correctly when sourcing a sql file - Post merge fix.
* | Bug#19799 delimiter command not working correctly when sourcing a sql fileunknown2006-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Fix problem with mysql.test relying on "echo" behaviourunknown2006-11-031-1/+0
| | | | | | | | | | | | | | | | mysql-test/r/mysql.result: Update test result after commenting out the test mysql-test/t/mysql.test: Rewrite the test commands so they don't depend on "echo" behaviour Comment out one as it's a duplicate
View Lorry Controller Status