summaryrefslogtreecommitdiff
path: root/client/mysql.cc
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-505 - feature request: add \H option for mysql client promptSergey Vojtovich2016-05-101-2/+4
| | | | | | An addition to original patch: - use FN_REFLEN instead of HOST_NAME_MAX (the latter can be undefined) - avoid calling gethostname() on every prompt construction by caching it
* MDEV-505: feature request: add \H option for mysql client promptDan Ungureanu2016-05-101-10/+22
| | | | | | Introduce `\H` option which behaves mostly like `\h`. The only exception is when the client connects to the server hosted on localhost. In this case, the hostname will be used instead.
* Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-1/+1
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-1/+1
| |\
| | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
| | |
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-251-36/+41
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-36/+41
| |\ \ | | |/
| | * MDEV-9149 Ctrl-C in MySQL client does not interrupt query, but interrupts ↵Sergei Golubchik2016-02-151-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the session instead mysql.cc: Unlike the main MYSQL structure, kill_mysql did not have MYSQL_OPT_PROTOCOL set. Move all connection-related settings to a separate function and use it both for the main MYSQL and for kill_mysql.
* | | MDEV-9117: Client Server capability negotiation for MariaDB specific ↵Oleksandr Byelkin2016-02-021-4/+4
| | | | | | | | | | | | | | | | | | | | | functionality New capability flags space. Removed old progress flag, added new one.
* | | cleanup: remove useless internal fied flagSergei Golubchik2015-11-241-1/+0
|/ /
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-1/+1
|\ \ | |/
| * MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build failures caused by new C runtime library - isnan, snprintf, struct timespec are now defined, attempt to redefine them leads - P_tmpdir, tzname are no more defined - lfind() and lsearch() in lf_hash.c had to be renamed, declaration conflicts with some C runtime functions with the same name declared in a header included by stdlib.h Also fix couple of annoying warnings : - remove #define NOMINMAX from config.h to avoid "redefined" compiler warnings(NOMINMAX is already in compile flags) - disable incremental linker in Debug as well (feature not used much and compiler crashes often) Also simplify package building with Wix, require Wix 3.9 or later (VS2015 is not compatible with old Wix 3.5/3.6)
* | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-8/+4
| | | | | | | | | | Replaced all references to LINT_INIT with UNINIT_VAR and LINT_INIT_STRUCT. Removed LINT_INIT macro.
* | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
| * 5.5.40+ mergeSergei Golubchik2014-10-091-0/+10
| |\
| | * mysql-5.5.40Sergei Golubchik2014-10-061-0/+10
| | |\
| | | * Bug #17297324 GLIBC DOUBLE FREE OR CORRUPTION WHEN KILLING CLIENT; CTRL+C Venkata Sidagam2014-07-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description: Sometimes when killing the mysql command line client with KILL -2(SIGINT), mysql client core dumps as a result of a double free or corruption. Analysis: When we run the mysql client in command line mode it will goes to mysql_end() and frees many data structures. At the same time (i.e after some data structures are freed), if we give "KILL -2" signal then the signal will be handled with function handle_kill_signal() and as part of it will again calls mysql_end() and goes with free() to the already freed data structure for batch_readline_end() function, which causes core dump. Fix: Ignoring SIGQUIT and SIGINT signals when cleanup process starts. This will help in resolving the double free issues, which occurs in case the signal handler function is started in between of the clean up function. For 5.6 we need to ignore SIGHUP also.
* | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-09-161-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-6561 libedit detection is brokenSergei Golubchik2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix readline/libedit detection: * search in readline/, editline/ and edit/readline/ * fix typos CMAKE_REQUIRES_LIBRARIES -> CMAKE_REQUIRED_LIBRARIES * use correct libedit API * use different cmake variables for libedit and readline
* | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* | | 5.5 mergeSergei Golubchik2014-05-091-1/+1
|\ \ \ | |/ /
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-2/+2
| |\ \ | | |/
| | * 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.
* | | MDEV-5736 remove what remains from ONE_SHOT hackSergei Golubchik2014-05-011-1/+0
| | |
* | | 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
* | | 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).
* | | | | 10.0-base mergeSergei Golubchik2014-02-031-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2014-02-011-3/+5
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | 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
| | | | | | |
| | | * | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-8/+17
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-8/+17
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-8/+17
| | | | | |\ \
| | * | | | | | 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-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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.
* | | | | | | | MDEV-4243 [PATCH] Warnings/errors while compiling with clangSergei Golubchik2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the code to compile with clang. fix warnings too. include/probes_mysql_nodtrace.h: clang++ doesn't like numeric _constants_ being used in || (it suspects that the intention was | ). Boolean constants are ok. sql/hostname.cc: only used in DBUG_ASSERT sql/item.cc: str_to_time and str_to_datetime return bool, not MYSQL_TIMESTAMP_xxx sql/item_func.cc: str_to_datetime_with_warn() returns bool, not MYSQL_TIMESTAMP_xxx storage/cassandra/CMakeLists.txt: CMAKE_CXX_FLAGS can be empty storage/connect/odbconn.cpp: HWND is void* storage/connect/user_connect.h: deprecated on FreeBSD and unused anyway storage/connect/value.cpp: bad characters inside. unused. storage/spider/spd_trx.cc: clang++ warns that memset will also overwrite vtbl. it might be as well a good idea, as it asserts that the object will only be used as a storage. silence the warning.
* | | | | | | | Client attributesunknown2013-10-031-0/+6
| | | | | | | |
* | | | | | | | 10.0-base merge.Sergei Golubchik2013-09-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | | | | | | merge 5.5 -> 10.0-baseunknown2013-08-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mysql --skip-column-names flag should not affect alignment of field values,Sergei Golubchik2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set num_flag[] unconditionally, not under "if (column_names)" http://ronaldbradford.com/blog/unexplained-trivial-mysql-behavior-2013-08-02/
* | | | | | | | 10.0-monty mergeSergei Golubchik2013-07-211-6/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-6/+7
| | | | | | | | |