summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* Bug#35269 mysqlcheck behaves different depending on order of parametersAlexey Botchkov2010-10-081-1/+10
| | | | | | | | | | | | | | | | | | | | Issue an error if user specifies multiple commands to run. Also there was an unnoticed bug that DO_CHECK was actually 0 which lead to wrong actions in some cases. The mysqlcheck.test contained commands with the suspicious meaning for the above reason. Extra commands removed from there. per-file commands: client/mysqlcheck.c Bug#35269 mysqlcheck behaves different depending on order of parameters Drop with an error if multiple commands. mysql-test/r/mysqlcheck.result Bug#35269 mysqlcheck behaves different depending on order of parameters result completed. mysql-test/t/mysqlcheck.test Bug#35269 mysqlcheck behaves different depending on order of parameters testcase added. not-working commands removed from some mysqlcheck calls.
* Fix for Bug#57094 (Copyright notice incorrect?).Alexander Nozdrin2010-10-0610-45/+36
| | | | | | | The fix is to: - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place to specify copyright notice; - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE in programs.
* mergeGeorgi Kodinov2010-10-042-66/+224
|\
| * Follow-up to 54861, cannot assume pthread_t is integral typeBjorn Munch2010-10-041-7/+9
| |
| * merge from 5.5-mtrBjorn Munch2010-10-041-16/+81
| |\
| | * upmerge 20304Bjorn Munch2010-10-011-0/+3
| | |\
| | | * Bug #20304 mysqltest: reap with no preceding statement hangs foreverBjorn Munch2010-10-011-0/+3
| | | | | | | | | | | | | | | | Added sanity check, similar to the one preventing send without reap
| | * | upmerge 52828Bjorn Munch2010-09-301-1/+12
| | |\ \ | | | |/
| | | * Bug #52828 Tests that use perl fail when perl is not in pathBjorn Munch2010-09-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to run perl fails, just like it does when perl is started but fails Trap the case that perl was not found/could not be started, and skip test Also force a restart of servers since test may already have done something mtr now also appends path of current perl to PATH to aid mysqltest
| | | * merge from 5.1Bjorn Munch2010-09-297-23/+21
| | | |\
| | * | \ upmerge 56125,56921Bjorn Munch2010-09-281-0/+33
| | |\ \ \ | | | |/ /
| | | * | Bug #56921 It should be possible to log connection statements in mysqltestBjorn Munch2010-09-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --enable-connect-log, somewhet similar to --enable-query-log If query log is disabled, disable connect log too Also some related cleanup in mysqltest.test: removing duplicate test loop
| | | * | Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Follow-up: don't call pthread_join() on Windows This change only valid for 5.1
| | * | | Bug #57036 Add checks in mysqltest that variables treated as ints are in ↵Bjorn Munch2010-09-271-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fact ints Adds boolean flag is_int and a separete function to check for int value Added tests to mysqltest.test
| | * | | upmerge 56753Bjorn Munch2010-09-201-0/+6
| | |\ \ \ | | | |/ /
| | | * | Bug #56753 mtr silently ignores junk after backticksBjorn Munch2010-09-151-0/+6
| | | | | | | | | | | | | | | | | | | | When stepping backward to end of `` expression, check for illegal chars
| | * | | merge from 5.5Bjorn Munch2010-09-202-3/+12
| | |\ \ \
| | * \ \ \ upmerge 55426(55546), 56647Bjorn Munch2010-09-141-5/+11
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-141-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #55546 mysqltest fails to create a new thread on HPUX Missing call to pthread_join(), in embedded mode This independently solves both problems, see 55426 for details. Addendum: cannot test against a pthread_t, adds boolean flag instead
| | | * | | Bug #56647 Valgrind warnings for memory leak in mysqltest.ccBjorn Munch2010-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Moved an init_dynamic_string() from before to after potential die()
| * | | | | mergeMattias Jonsson2010-10-011-3/+5
| |\ \ \ \ \
| | * | | | | Bug#56659: Mismatch of CAPITAL vs small letters in "unified filelist" ↵Mattias Jonsson2010-09-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partitioning output Bug#56657: Test still uses "--exec rm -f ..." which is non-portable Bug#56601: Test uses Unix path for temporary file, fails, and writes misleading message Several tests that was written in a non portable way (failed on windows) Fixed by 1) backporting the fix for replace_result to also apply to list_files (mysqltest from mysql-trunk) 2) replacing all #p#/#sp#/#tmp# to #P#/#SP#/#TMP#/ (innodb always converts filenames to lower case in windows). 3) replacing '--exec rm -f' with '--remove_files_wildcard' 4) replacing a perl snippet with '--write_file'
| * | | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-09-283-5/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge 5.5 -> 5.5-merge.Konstantin Osipov2010-09-242-3/+12
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | * | | | merge from 5.5Bjorn Munch2010-09-011-4/+0
| | |\ \ \ \
| | * \ \ \ \ upmerge 55178,55413Bjorn Munch2010-08-301-2/+14
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | merge 55413Bjorn Munch2010-08-301-2/+8
| | | |\ \ \ \
| | | | * | | | Bug #55413 mysqltest gives parse error for lines matching "^let.*\\.*;$"Bjorn Munch2010-08-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow escaped quotes also in statements not starting with -- But will not support single unescaped ' or `
| * | | | | | | merging.Alexey Botchkov2010-09-081-47/+131
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#54861 Additional connections not handled properly in mtr --embeddedAlexey Botchkov2010-09-011-47/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in embedded-serve mode, mysqltest tried to run '--send' commands in the separate thread. That upsets some engines (InnoDB particularly) as the transaction has to be executed in the same thread completely. So i implemented some different approach. So we create one separate thread for each connection and execute all the queries of this connection inside it. Looks even simpler than it was for me. per-file comments: client/mysqltest.cc Bug#54861 Additional connections not handled properly in mtr --embedded Now the connection has one running connection_thread() attached. And sends all the query and read-result requests to it.
| * | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-09-011-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Bug#56117 ha_ndbcluster_tables.h included by mysqldump but not usedMagnus Blåudd2010-08-301-1/+0
| | |/ / / / / | |/| | | | | | | | | | | | - Remove include of ha_ndbcluster_tables.h from mysqldump.c
* | | | | | | merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-204-7/+15
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Automerge (most) changes of the 5.5.6-rc release build to main 5.5.Joerg Bruehe2010-09-102-3/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | This is not the final merge!
| | * | | | | Fix bug#56547 mysql client interprets commands in commentsJoerg Bruehe2010-09-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was not caused by a change in the client, rather by the tests using the Windows built-in "echo" and not the one built by MySQL. This again happened because the binary was missing in the package, caused by the wrong macro being used to build it in "cmake".
| | * | | | | Bug#55077: Assertion failed: width > 0 && to != ((void *)0),Alexey Kopytov2010-08-251-2/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file .\dtoa.c The assertion failure was correct because the 'width' argument of my_gcvt() has the signed integer type, whereas the unsigned value UINT_MAX32 was being passed by the caller (Field_double::val_str()) leading to a negative width in my_gcvt(). The following chain of problems was found by further analysis: 1. The display width for a floating point number is calculated in Field_double::val_str() as either field_length or the maximum possible length of string representation of a floating point number, whichever is greater. Since in the bug's test case field_length is UINT_MAX32, we get the same value as the display width. This does not make any sense because for numeric values field_length only matters for ZEROFILL columns, otherwise it does not make sense to allocate that much memory just to print a number. Field_float::val_str() has a similar problem. 2. Even if the above wasn't the case, we would still get a crash on a slightly different test case when trying to allocate UINT_MAX32 bytes with String::alloc() because the latter does not handle such large input values correctly due to alignment overflows. 3. Even when String::alloc() is fixed to return an error when an alignment overflow occurs, there is still a problem because almost no callers check its return value, and Field_double::val_str() is not an exception (same for Field_float::val_str()). 4. Even if all of the above wasn't the case, creating a Field_double object with UINT_MAX32 as its field_length does not make much sense either, since the .frm code limits it to MAX_FIELD_CHARLENGTH (255) bytes. Such a beast can only be created by create_tmp_field_from_item() from an Item with REAL_RESULT as its result_type() and UINT_MAX32 as its max_length. 5. For the bug's test case, the above condition (REAL_RESULT Item with max_length = UINT_MAX32) was a result of Item_func_if::fix_length_and_dec() "shortcutting" aggregation of argument types when one of the arguments was a constant NULL. In this case, the attributes of the aggregated type were simply copied from the other, non-NULL argument, but max_length was still calculated as per the general, non-shortcut case, by choosing the greatest of argument's max_length, which is obviously not correct. The patch addresses all of the above problems, even though fixing the assertion failure for the particular test case would require only a subset of the above problems to be solved.
| * | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-301-4/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#54466 client 5.5 built from source lacks "pager" supportAlexey Botchkov2010-08-191-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #ifdef THREAD removed from mysql.cc. No reason was found for this limitation to persist. per-file comments: client/mysql.cc Bug#54466 client 5.5 built from source lacks "pager" support now we have USE_POPEN always if not __WIN__ mysql-test/r/mysql.result Bug#54466 client 5.5 built from source lacks "pager" support result updated. mysql-test/t/mysql.test Bug#54466 client 5.5 built from source lacks "pager" support test case added.
| * | | | | Merge 5.1-bugteam to 5.5-merge.Sergey Vojtovich2010-08-271-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Reduced #ifndef for 52301, caused compile warningBjorn Munch2010-08-261-4/+0
| | | | | |
| | * | | | merge followup fix for 52301Bjorn Munch2010-08-251-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug #52301 Add --protocol to mysqltestBjorn Munch2010-08-251-0/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Added code resulted in strange linking problem for embedded on Windows Avoided by not doing this for embedded mode It's irrelevant for embedded server anyway, --protocol will be ignored
| | * | | merge from 5.1-mtrBjorn Munch2010-08-061-30/+99
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
* | | | merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-163-32/+104
|\ \ \ \ | |/ / /
| * | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
| | | | | | | | | | | | Fixing copyright text.
| * | | Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-121-0/+3
| |\ \ \
| | * | | fix for Bug #55672 "mysql_upgrade dies with internal error":Guilhem Bichot2010-08-111-0/+3
| | | | | | | | | | | | | | | it couldn't parse the --ssl option.
| * | | | merge from trunk-mtrBjorn Munch2010-08-051-30/+99
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | upmerge 55582Bjorn Munch2010-08-051-1/+16
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge from 5.1Bjorn Munch2010-08-0410-399/+413
| | | |\ \