summaryrefslogtreecommitdiff
path: root/client/mysql.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | mysql: don't crash when --show-warnings is enabledSergei Golubchik2010-05-211-1/+1
* | | Fixed compiler warningsMichael Widenius2010-04-081-2/+3
* | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-0/+65
|/ /
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-7/+17
|\ \ | |/
| * WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-271-1/+1
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-4/+13
| * mergeGeorgi Kodinov2009-12-241-1/+1
| |\
| | * Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-1/+1
| | * 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
* | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-5/+3
|\ \ \ \ | |/ / /
| * | | merge to mysql-5.1-bugteamSatya B2009-11-261-3/+1
| |\ \ \
| | * | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ clientTatiana A. Nurnberg2009-11-021-3/+1
| * | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39Satya B2009-11-251-2/+2
| |/ / /
* | | | MergeMichael Widenius2009-12-031-11/+8
|\ \ \ \
| * \ \ \ Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-031-11/+8
| |\ \ \ \
| | * \ \ \ Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-111-7/+21
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-7/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-7/+21
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | manual merge of 28141Tatiana A. Nurnberg2009-10-201-6/+20
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-3/+19
| | * | | mergeGeorgi Kodinov2009-10-141-1/+1
| | |\ \ \ | | | |/ /
| | | * | "MySQL Network" => "MySQL Enterprise"Kent Boortz2009-10-081-1/+1
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-1/+1
| | | |/ | | |/|
* | | | Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build)...Michael Widenius2009-11-261-3/+2
|/ / /
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-9/+10
|\ \ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-10/+11
| |\ \ \ | | |/ /
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-1/+2
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-1/+2
| | * | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-9/+9
* | | | Fixed compiler warning messageMichael Widenius2009-10-261-3/+8
|/ / /
* | | Fixed typoMichael Widenius2009-10-021-1/+1
* | | Added client functions:Michael Widenius2009-10-021-5/+13
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-52/+112
|\ \ \ | |/ /
| * | Merge bug fix.Jim Winstead2009-07-301-3/+28
| |\ \
| | * | The handling of NUL bytes in column data in the various output formatsJim Winstead2009-07-141-3/+28
| * | | Merge in bug fixes for client toolsJim Winstead2009-07-141-1/+21
| |\ \ \ | | |/ /