summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
...
| * | MDEV-6091 mysqldump goes in a loop and segfaults if --dump-slave is ↵Sergei Golubchik2014-05-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | specified and it cannot connect to the server do_start_slave_sql() is called from maybe_exit(). We should not recurse when maybe_exit() is called for an error during do_start_slave_sql(). Also remove a meaningless (but safe) "goto err".
| * | MDEV-5138 Numerous test failures in "mtr --ps --embedded".Alexey Botchkov2014-04-151-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqltest in the 'embedded-server' mode runs queries in a separate thread, but it didn't do so for the prepared statements - they were run in the main thread. That leads to inconsistencies. When a test sets SESSION 'dbug' variable like SET SESSION debug_dbug="+d,warn_during_ha_commit_trans"; it is run as a plain query in that separate thread, so the main thread remains unaffected. After that the prepared statement run in the main thread doesn't produce expected 'dbug' errors, so the test fails. To fix that I made prepared statement to be run in that special thread along with the plain queries. That makes the environment consistent.
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-272-2/+3
| |\ \ | | |/
| | * Bug #18186103 BUFFER OVERFLOW IN CLIENTVamsikrishna Bhagi2014-02-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: While printing the Server version, mysql client doesn't check for the buffer overflow in a String variable. Solution: Used a different print function which checks the allocated length before writing into the string.
| | * Bug#14117012 - CHILD PROCESS MYSQL UTILITIES PICKING UP LOCALPraveenkumar Hulakund2014-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG FILES CAUSES TEST Utility as "mysql_upgrade" forks "mysql"/"mysqlcheck". Attaching "mysql_upgrade" shows following calls after forking "mysql" or "mysql_check" when configuration file information is passed as first argument to "mysql_upgrade". strace -f ./mysql_upgrade --defaults-file=../pdb/my.cnf --socket=../pdb/mysql.sock -f [pid 6254] stat("/etc/my.cnf", 0x7fff8e772680) = -1 ENOENT (No such file or directory) [pid 6254] stat("/etc/mysql/my.cnf", 0x7fff8e772680) = -1 ENOENT (No such file or directory) [pid 6254] stat("/usr/local/mysql/etc/my.cnf", 0x7fff8e772680) = -1 ENOENT (No such file or directory) [pid 6254] stat("/home/user_name/.my.cnf", {st_mode=S_IFREG|0664, st_size=19, ...}) = 0 [pid 6254] open("/home/user_name/.my.cnf", O_RDONLY) = 3 But when tool forks "mysqlcheck"/"mysql", "--no-defaults" is passed as first argument. Before forking, in function "find_tool" of "mysql_upgrade", check is made to verify whether tool can be executable or not by calling "mysqlcheck --help" and "mysql --help". But argument "--no-defaults", "--defaults-file" or "defaults-extra-file" is not passed to "mysql" and "mysqlcheck". So my.cnf is searched in default paths. Fix: ------ Modified code to pass "--no-defaults" as first argument to "mysql" and "mysqlcheck" while checking tool can be executed or not.
* | | merge MySQL-5.6 bugfix "Bug#17862905: MYSQLDUMP CREATES USELESS METADATA LOCKS"Sergei Golubchik2014-05-051-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | revno: 5716 committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> branch nick: mysql_5_6 timestamp: Sat 2013-12-28 22:08:40 +0530 message: Bug#17862905: MYSQLDUMP CREATES USELESS METADATA LOCKS
* | | MDEV-5736 remove what remains from ONE_SHOT hackSergei Golubchik2014-05-011-1/+0
| | |
* | | 5.5 mergeSergei Golubchik2014-03-261-0/+1
|\ \ \ | |/ /
| * | mysqltest bug: reset --replace command after everySergei Golubchik2014-03-241-0/+1
| | | | | | | | | | | | error message (because error messages use replacements)
| * | MDEV-5723: mysqldump -uroot unusable for multi-database operations, checks ↵Sergey Petrunya2014-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | all databases - MariaDB-5.5 part of the fix: since we can't easily fix query optimization for I_S tables, run the affected-tablespaces query with semijoin=off. It happens to have a good query plan with that setting.
* | | Fixed some failing testsMichael Widenius2014-03-121-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove memory warnings if mysql client aborts early Changed copyright for clients client/mysql.cc: Free memory if get_options fails, so that we don't get warnings from safemalloc include/welcome_copyright_notice.h: Added SkySQL to client copyrights mysql-test/valgrind.supp: Added suppressions for memory leaks from dlopen() for OpenSUSE 12.3 storage/oqgraph/mysql-test/oqgraph/regression_mdev5744.result: Suppress warning storage/oqgraph/mysql-test/oqgraph/regression_mdev5744.test: Suppress warning
* | | MDEV-5675 - Performance: my_hash_sort_bin is called too oftenSergey Vojtovich2014-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced number of my_hash_sort_bin() calls from 4 to 1 per query. Reduced number of memory accesses done by my_hash_sort_bin(). Details: - let MDL subsystem use pre-calculated hash value for hash inserts and deletes - let table cache use pre-calculated MDL hash value - MDL namespace is excluded from hash value calculation, so that hash value can be used by table cache as is - hash value for MDL is calculated as resulting hash value + MDL namespace - extended hash implementation to accept user defined hash function
* | | 10.0-base mergeSergei Golubchik2014-03-051-1/+9
|\ \ \
| * | | MDEV-5723: mysqldump -uroot unusable for multi-database operations, checks ↵Sergey Petrunya2014-03-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all databases - MariaDB-5.5 part of the fix: since we can't easily fix query optimization for I_S tables, run the affected-tablespaces query with semijoin=off. It happens to have a good query plan with that setting. [This is a forward-port to MariaDB 10.0]
* | | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
| | | |
* | | | 10.0-base mergeSergei Golubchik2014-02-263-17/+27
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-254-18/+28
| |\ \ \ | | |/ /
| | * | 5.3 mergeSergei Golubchik2014-02-221-1/+2
| | |\ \
| | | * | MDEV-5481 mysqldump fails to dump geometry types properly.Alexey Botchkov2014-02-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed so the MYSQL_TYPE_GEOMETRY is treated as BLOB.
| | * | | MDEV-5624 mysqldump --dump-slave option does not restart the replication if ↵Sergei Golubchik2014-02-211-7/+12
| | | | | | | | | | | | | | | | | | | | the dump has failed
| | * | | send_eval may free evaluated query buffer before connection threadSergey Vojtovich2014-02-181-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually consumed it. With this patch evaluated query buffer is freed along with query buffer. The problem was uncovered by udf_debug_sync.test when it was run with --embedded.
| | * | | MySQL-5.5.36 mergeSergei Golubchik2014-02-172-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | * | Updated/added copyright headersMurthy Narkedimilli2014-01-062-2/+2
| | | | |
| | | * | Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE FILES Arun Kuruvila2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPECIFIED WITH THE BASEDIR OPTION Description: The mysql_plugin client attempts to remove any filename specified to the --basedir option. The problem is that if the filename does not end with a slash, it will attempt to unlink it, which succeeds for files, but not for directories. Analysis: When we are starting mysql_plugin with basedir option and if we are giving path of a file as basedir, it deletes that file. It was because it uses a function my_delete which unlinks the file path given. Fix: As a fix we replace that line using another function my_free, which will only free the pointer which is having that file path.
| | | * | Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE Venkata Sidagam2013-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FILES SPECIFIED WITH THE BASEDIR OPTION Reverting the patch. Because asked for second review.
| | | * | Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE FILES Arun Kuruvila2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPECIFIED WITH THE BASEDIR OPTION Description: The mysql_plugin client attempts to remove any filename specified to the --basedir option. The problem is that if the filename does not end with a slash, it will attempt to unlink it, which succeeds for files, but not for directories. Analysis: When we are starting mysql_plugin with basedir option and if we are giving path of a file as basedir, it deletes that file. It was because it uses a function my_delete which unlinks the file path given. Fix: As a fix we replace that line using another function my_free, which will only free the pointer which is having that file path.
* | | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is port of fix for MySQL BUG#17647863. revno: 5572 revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj committer: Jon Olav Hauglid <jon.hauglid@oracle.com> timestamp: Thu 2013-10-31 00:22:43 +0100 message: Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM Rename test() macro to MY_TEST() to avoid conflict with libc++.
* | | | | Changed " to ' around connection name (safer)Michael Widenius2014-02-121-3/+3
| | | | |
* | | | | Fixed that --apply-slave-statements also uses multi-sourceMichael Widenius2014-02-111-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_mysqldump_slave.result: Updated test result
* | | | | Fixed MDEV-4551: mysqldump --dump-slave fails with multi-source replicationMichael Widenius2014-02-111-44/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running with multi-source enabled master (MariaDB 10.0) all master will be recorded mysql-test/r/rpl_mysqldump_slave.result: Updated results to new syntax
* | | | | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID. MDEV-4726: Race in mysql-test/suite/rpl/t/rpl_gtid_stop_start.test MDEV-5636: Deadlock in RESET MASTER
| | * | | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MASTER_GTID_WAIT() is similar to MASTER_POS_WAIT(), but works with a GTID position rather than an old-style filename/offset. @@LAST_GTID gives the GTID assigned to the last transaction written into the binlog. Together, the two can be used by applications to obtain the GTID of an update on the master, and then do a MASTER_GTID_WAIT() for that position on any read slave where it is important to get results that are caught up with the master at least to the point of the update. The implementation of MASTER_GTID_WAIT() is implemented in a way that tries to minimise the performance impact on the SQL threads, even in the presense of many waiters on single GTID positions (as from @@LAST_GTID).
* | | | | | merge 10.0-base ->10.0unknown2014-02-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Upgrading the bundled PCRE to 8.34Alexander Barkov2014-02-031-1/+1
| | | | | |
* | | | | | 10.0-base mergeSergei Golubchik2014-02-0310-17/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2014-02-0110-17/+44
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 5.3 mergeSergei Golubchik2014-01-281-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | 5.2 mergeSergei Golubchik2014-01-281-1/+1
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2014-01-281-1/+1
| | | | |\ \
| | | | | * | fixed a client-side overflow in mysql cliSergei Golubchik2014-01-281-1/+1
| | | | | | |
| | * | | | | workaround test failures in buildbot:Sergei Golubchik2014-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in some VMs readline thinks that the window size is zero. ignore it.
| | * | | | | Fix for MDEV-5547: Bad error message when moving very old .frm files to ↵Michael Widenius2014-01-2210-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB 5.5. mysql_upgrade --help now also prints out --default options and variable values. mysql_upgrade now prints permission errors. mysql_upgrade doesn't print some non essential info if --silent is used. Added handler error message about incompatible versions Fixed that mysqlbug and mysql_install_db have the executable flag set. Removed executable flag for some non executable files. Changed in mysql_install_db askmonty.org to mariadb.com. Ensured that all client executables prints --default options the same way. Allow REPAIR ... USE_FRM for old .frm files if the are still compatible. Extended shown error for storage engine messages. client/mysql.cc: print_defaults() should be first (as in all other programs) client/mysql_upgrade.c: --help now also prints out --default options and variable values Print out error if wrong permissions Don't print info if --silent client/mysqladmin.cc: print_defaults() should be first (as in all other programs) client/mysqlbinlog.cc: Added print_defaults() to --help client/mysqlcheck.c: Added empty line in --help client/mysqlimport.c: Added empty line in --help client/mysqlshow.c: Made --help compatible client/mysqlslap.c: Made --help compatible client/mysqltest.cc: Added print_defaults() to --help include/handler_ername.h: Added handler error message include/my_base.h: Added handler error message mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/repair.result: Added test case for better error messages mysql-test/std_data/host_old.MYD: Added test case for better error messages mysql-test/std_data/host_old.MYI: Added test case for better error messages mysql-test/std_data/host_old.frm: Added test case for better error messages mysql-test/t/repair.test: Added test case for better error messages mysys/my_handler_errors.h: Added handler error message scripts/CMakeLists.txt: Fixed that mysqlbug and mysql_install_db have the executable flag set scripts/mysql_install_db.sh: askmonty.org -> mariadb.com sql/ha_partition.cc: Sometimes table_type() can be called for errors even if partition didn't manage to open any files sql/handler.cc: Write clear text for not handled, but defined error messages. sql/share/errmsg-utf8.txt: Extended shown error for storage engine messages sql/sql_admin.cc: Allow REPAIR ... USE_FRM for old .frm files if the are still compatible storage/myisam/ha_myisam.cc: Use new error message
* | | | | | | 10.0-base mergeSergei Golubchik2013-12-162-2/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.5 mergeSergei Golubchik2013-12-151-1/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-5323 Ctrl-C not working under UbuntuSergei Golubchik2013-12-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't reset interrupted_query after sending the KILL signal, otherwise the client won't know it has to stop fetching and printing the data.
| * | | | | | 5.5 mergeSergei Golubchik2013-11-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mysql-5.5.34 mergeSergei Golubchik2013-11-191-1/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | (some patches reverted, test case added)
| | | * | | | BUG#15844882: MYSQLDUMP FROM 5.5 FAILS WITH AN ERROR WHEN TRYINGNisha Gopalakrishnan2013-07-181-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TO DUMP DATA FROM MYSQL-5.6 Merge from mysql-5.1 to mysql-5.5.
| | | | * | | | BUG#15844882: MYSQLDUMP FROM 5.5 FAILS WITH AN ERROR WHEN TRYINGNisha Gopalakrishnan2013-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TO DUMP DATA FROM MYSQL-5.6 Analysis -------- Dumping mysql-5.6 data using mysql-5.1/mysql-5.5 'myqldump' utility fails with a syntax error. Server system variable 'sql_quote_show_create' which quotes the identifiers is set in the mysqldump utility. The mysldump utility of mysql-5.1/mysql-5.5 uses deprecated syntax 'SET OPTION' to set the 'sql_quote_show_create' option. The support for the syntax is removed in mysql-5.6. Hence syntax error is reported while taking the dump. Fix: --- Changed the 'mysqldump' code to use the syntax 'SET SQL_QUOTE_SHOW_CREATE' to set the 'sql_quote_show_create' option. That syntax is supported on mysql-5.1, mysql-5.5 and mysql-5.6. NOTE: I have not added an mtr test case since it is difficult to simulate the condition. Also the syntax may not be further simplified in the future.