summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* merge from 5.1-mtrBjorn Munch2010-02-221-61/+233
|\
| * Bug #51135 Please increase the maximum number of connections allowed in ↵Bjorn Munch2010-02-171-10/+21
| | | | | | | | | | | | | | mysqltest Added --max-connections= argument to mysqltest and mtr Small fix to first patch: forgot to check before free'ing connections array
| * Bug #50618 Please allow 'sleep $variable' in mtrBjorn Munch2010-02-091-5/+17
| | | | | | | | | | Made mtr's sleep function understand $variables A few fixes since previous patch, added tests
| * merge from 5.1 mainBjorn Munch2010-02-076-19/+59
| |\
| * | Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be ↵Bjorn Munch2010-02-041-1/+78
| | | | | | | | | | | | | | | | | | | | | documented Added remove_files_wildcard that allows to remove multiple files at once. This is a port of original patch to Windows.
| * | merge 49837Bjorn Munch2010-01-201-0/+4
| |\ \
| | * | Bug #49837 mysqltest exec cannot handle multi-line command correctlyBjorn Munch2010-01-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Since the exec command line is passed on externally, it cannot take newlines Simply replace \n with space Now also added test case
| * | | merge 48888Bjorn Munch2010-01-201-2/+2
| |\ \ \
| | * | | Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ↵Bjorn Munch2010-01-201-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~1024 symbols valgrind pointed to a buffer allocated by my_realloc which looked fishy Replaced size with what was probably intended, added test case. Now also fixed line after review comment
| * | | Bug #49878 delimiter under false 'if' makes mysqltest test fail with ↵Bjorn Munch2010-01-201-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Missing end of block' delimiter not executed so does not recognize end of block Always execute delimiter command, revert after false if() block.
| * | | exporting server version and other as env var (bug#50471)Bernd Ocklin2010-01-201-1/+8
| |/ /
| * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-071-4/+3
| | | | | | | | | | | | | | | Undid amendment allowing pending reap after switching connections Moved check for pending reap earlier; failed if running with ps-protocol
| * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-061-0/+1
| | | | | | | | | | | | Small amendment: ignore pending reap when switching connection, add test
| * | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-061-2/+12
| | | | | | | | | | | | Set a flag after send to trap the case
| * | Bug #48863 mysql test: enable and disable case insensitive compare modeBjorn Munch2010-01-061-2/+24
| | | | | | | | | | | | Implemented --lowercase_result which lower cases next result
| * | Merge from 5.1 mainBjorn Munch2009-12-163-44/+128
| |\ \
| * | | backport mysqltest send_eval from 42520Bjorn Munch2009-12-161-2/+4
| | | |
| * | | Bug #48250 mysqtest_embedded can lock destroyed mutexBjorn Munch2009-11-261-4/+4
| | | | | | | | | | | | | | | | | | | | As suggested, replaced relevant uses of my_fopen with fopen (and close) Tested on HPUX where it was reproducable with test innodb_bug30919
| * | | Bug #48671 mysqltest fails on 'perl' in file sourced inside 'while'Bjorn Munch2009-11-111-32/+41
| | | | | | | | | | | | | | | | | | | | Actually, fails on 'perl' in any while Fixed essentially the same way as for append_file
* | | | Recommit of Bug#49447.Staale Smedseng2010-02-0410-144/+171
| |_|/ |/| |
* | | Bug #49223 Change help description for mysqldumpStaale Smedseng2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | --extended-insert Help message changed to the same as in the 5.1 online documentation.
* | | WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-273-5/+9
| | | | | | | | | | | | | | | WL#5182 is a follow-up to WL#5154, deprecating a few more options and system variables.
* | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-215-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several items said to be deprecated in the 4.1 manual have never been removed. This worklog adds deprecation warnings when these items are used, and warns the user that the items will be removed in MySQL 5.6. A couple of previously deprecation decision have been reversed (see single file comments)
* | | mergeGeorgi Kodinov2009-12-241-1/+1
|\ \ \
| * | | Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strmov() is not guaranteed to work correctly on overlapping source and destination buffers. On some OSes it may work, but Fedora 12 has a stpcpy() that's not working correctly on overlapping buffers. Fixed to use the overlap-safe version of strmov instead. Re-vitalized the overlap-safe version of strmov.
* | | | Manual merge.Davi Arnaut2009-12-181-2/+2
|\ \ \ \ | |/ / /
| * | | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is a somewhat common misusage of the strmake function. The strmake(dst, src, len) function writes at most /len/ bytes to the string pointed to by src, not including the trailing null byte. Hence, if /len/ is the exact length of the destination buffer, a one byte buffer overflow can occur if the length of the source string is equal to or greater than /len/.
| * | | Backport fix for Bug #27884.Jim Winstead2009-11-231-4/+7
| | | |
* | | | Merge approved bug fixJim Winstead2009-12-171-1/+2
|\ \ \ \
| * | | | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | when used in conjunction with --vertical. (Bug #47147, patch by Harrison Fisk)
* | | | | This is a patch for bug#41569.lars-erik.bjork@sun.com2009-12-031-0/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table but does not set values". mysql_upgrade (ver 5.1) adds 3 fields (character_set_client, collation_connection and db_collation) to the mysql.proc table, but does not set any values. When we run stored procedures, which were created with mysql 5.0, a warning is logged into the error log. The solution to this is for mysql_upgrade to set default best guess values for these fields. A warning is also written during upgrade, to make the user aware that default values are set.
* | | | merge to mysql-5.1-bugteamSatya B2009-11-261-3/+1
|\ \ \ \
| * \ \ \ auto-mergeTatiana A. Nurnberg2009-11-241-3/+1
| |\ \ \ \
| | * | | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ clientTatiana A. Nurnberg2009-11-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting the (5.1+) mysql command-line client, we try to get "select @@version_comment" from the server to present it to the user. Recent clients are aware that older servers do not have that variable and fall back on other info to be able to present *something* at least. This fallback string was allocated through the POSIX interface, but released through the my*() suite, which rightfully complained about the imbalance in calls when compiled with --debug. While this wasn't as bad as it looked (no double-free, use of uninitialized or freed buffer, etc.), it did look funky. Using my_strdup() now for what will be my_free()d later.
* | | | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39Satya B2009-11-251-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql client displays wrong character-set of server. When a user changes the charset of a server, mysql client 'status' command displays wrong charset but the command "SHOW VARIABLES LIKE "%charset%" displayed correct charset results. The problem is only with the mysql client's 'status' command output. In mysql client, the method mysql_store_lazy_result() returns 0 for success and non-zero for failure. The method com_status() was using this method wrongly. Fixed all such instances according to return value of the method mysql_store_lazy_result().
* | | | | Post-merge fixes: fix typo and remove unused variables.Davi Arnaut2009-11-211-4/+1
| | | | |
* | | | | mergeVladislav Vaintroub2009-11-033-38/+57
|\ \ \ \ \
| * \ \ \ \ mergeGeorgi Kodinov2009-10-301-24/+28
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge from 5.0-mainGeorgi Kodinov2009-10-301-24/+28
| | |\ \ \ \
| | | * \ \ \ Merge from mysql-5.0.87-releasekaren.langford@sun.com2009-10-261-24/+28
| | | |\ \ \ \
| | | | * | | | Added make targets 'test-bt-fast' and 'test-bt-debug-fast'Hery Ramilison2009-10-151-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put variable declaration at the beginning of a block
| * | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to ↵2009-10-281-5/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | understand Append the description of the 'decode-rows' value for --base64-output argument.
| * | | | | | merged 5.1-main-> 5.1-bugteamGeorgi Kodinov2009-10-231-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | merge from 5.1 mainBjorn Munch2009-10-167-12/+80
| | |\ \ \ \ \
| | * | | | | | Bug #47218 mysqltest ignores "error" command inside if inside loopBjorn Munch2009-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was affected by same problem as append_file etc. Added Q_ERROR to special handling, and added small test
| * | | | | | | auto-mergeTatiana A. Nurnberg2009-10-201-7/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to ↵2009-10-201-7/+5
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | understand There are some problems about help text: - It is stated that "auto" is the default twice. It need be stated only once. - It is stated that --base64-output is short for --base64-output=always. But that sounds like the default is "always", not "auto". Make the help text clear as following: Determine when the output statements should be base64-encoded BINLOG statements: 'never' disables it and works only for binlogs without row-based events; 'auto' prints base64 only when necessary (i.e., for row-based events and format description events); 'always' prints base64 whenever possible. 'always' is for debugging only and should not be used in a production system. If this argument is not given, the default is 'auto'; if it is given with no argument, 'always' is used.
| * | | | | | | manual merge of 28141Tatiana A. Nurnberg2009-10-201-6/+20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server ↵Tatiana A. Nurnberg2009-10-191-3/+19
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shutdown) If a thread is killed in the server, we throw "shutdown" only if one is actually in progress; otherwise, we throw "query interrupted". Control-C in the mysql command-line client is "incremental" now. First Control-C sends KILL QUERY (when connected to 5.0+ server, otherwise, see next) Next Control-C sends KILL CONNECTION Next Control-C aborts client. As the first two steps only pertain to an existing query, Control-C will abort the client right away if no query is running. client will give more detailed/consistent feedback on Control-C now.
| * | | | | mergeGeorgi Kodinov2009-10-141-1/+1
| |\ \ \ \ \ | | |/ / / /