summaryrefslogtreecommitdiff
path: root/client/mysql.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-3/+3
| | | * Bug #12615411 - server side help doesn't work as first statementVenkata Sidagam2012-07-191-3/+11
* | | | 5.2->5.3 mergeSergei Golubchik2011-12-121-3/+4
|\ \ \ \ | |/ / /
| * | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-3/+4
* | | | Merge with 5.2.Michael Widenius2011-12-111-2/+2
|\ \ \ \ | |/ / /
| * | | Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+2
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+1
| | |\ \ | | | |/
| | | * BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-1/+1
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-1/+1
| | |\ \ | | | |/
| | | * Manual merge from mysql-5.0.Alexander Nozdrin2011-07-221-7/+3
| | | |\
| | | | * For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENTAlexander Nozdrin2011-07-221-6/+5
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+5
* | | | | Added handler and temporary table usage to mytopMichael Widenius2011-12-031-0/+2
* | | | | Added MariaDB executable comment syntax: /*M!##### */Michael Widenius2011-08-291-2/+2
* | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-3/+54
|/ / / /
* | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+11
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+11
| |\ \ \ | | |/ /
| | * | Follow up fix for bug#57450.Dmitry Shulga2011-02-091-0/+2
| | * | Fixed bug#57450 - mysql client enter in an infinite loopDmitry Shulga2011-02-051-6/+10
* | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-181-1/+2
* | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-3/+7
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-3/+7
| |\ \ \ | | |/ /
| | * | Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commandsNirbhay Choubey2010-11-261-2/+6
* | | | merge with 5.1Michael Widenius2010-11-301-5/+10
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-5/+10
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-191-5/+10
* | | | Automatic merge with 5.1Michael Widenius2010-11-041-1/+1
|\ \ \ \ | |/ / /
| * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-1/+1
* | | | Automatic mergeMichael Widenius2010-10-011-2/+3
|\ \ \ \
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-2/+3
* | | | | merge with 5.1Sergei Golubchik2010-09-111-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+2
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-2/+2
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-1/+0
* | | | Automerge with 5.1Michael Widenius2010-08-251-5/+12
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2010-08-241-1/+1
| * | | Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_Michael Widenius2010-08-231-4/+11
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-80/+97
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-80/+97
| |\ \ \ | | |/ /
| | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-79/+96
* | | | Merge with MariaDB 5.1Michael Widenius2010-07-171-4/+7
|\ \ \ \ | |/ / /
| * | | mysql client: Ignore --comments at start of command line. This allows one to ...Michael Widenius2010-07-161-4/+7
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-28/+35
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-28/+35
| |\ \ \ | | |/ /
| | * | Bug #44178: mysql cli does not comply with GPLv2 clause 2cGeorgi Kodinov2010-03-111-9/+11
| | * | Recommit of Bug#49447.Staale Smedseng2010-02-041-20/+24