summaryrefslogtreecommitdiff
path: root/client/mysql.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MySQL 5.1.42mariadb-merge-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.mariadb-merge-mysql-5.1.39unknown2009-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->MariaDBmariadb-merge-mysql-5.1.38minusSergey 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
| |\ \ \ | | |/ /
| | * | The mysql command-line client would include superfluous spaces at the end ofJim Winstead2009-05-201-1/+4
| | * | The mysql command-line client didn't implement the readline magic-spaceJim Winstead2009-05-191-0/+17
| * | | Bug#37274 client 'status' command doesn't print all info after losing connect...Kristofer Pettersson2009-07-031-31/+32
| * | | Merge from 5.0Staale Smedseng2009-06-291-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge from 5.0-btStaale Smedseng2009-06-291-3/+3
| * | | Bug#44834 strxnmov is expected to behave as you'd expectSergey Glukhov2009-06-191-1/+1
| * | | Automerge.Alexey Kopytov2009-06-171-1/+1
| |\ \ \ | | |/ /
| | * | Bug #45236: large blob inserts from mysqldump fail, possible Alexey Kopytov2009-06-101-1/+1
| * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-281-2/+2
| |\ \ \ | | |/ /
| | * | Bug#37268 'binary' character set makes CLI-internal commands case sensitiveSergey Glukhov2009-05-281-2/+2
| * | | Merge from 5.0-bugteamJim Winstead2009-05-131-3/+9
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix support for -i (--ignore-spaces) in the mysql command line application,Jim Winstead2009-05-071-3/+8
| * | The mysql command-line client did not properly handle MYSQL_HISTFILE being setJim Winstead2009-05-071-2/+8
| * | Remove extraneous space in --debug-check usage info.Jim Winstead2009-04-281-1/+1
| * | Bug #27884: mysql --html does not quote HTML special characters in outputJim Winstead2009-04-281-4/+7
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-04-141-1/+1
| |\ \ | | |/
| | * Bug#41268 Help Text for \c is misleading in client command line interface(addon)Sergey Glukhov2009-04-141-1/+1
| | * auto-mergeTatiana A. Nurnberg2009-03-231-13/+32
| | |\
| | | * auto-mergeIgnacio Galarza2009-03-191-10/+14
| | | |\
| | | * \ auto-mergeIgnacio Galarza2009-03-191-3/+17
| | | |\ \
| | | * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-3/+4
* | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-23/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | auto-mergeTatiana A. Nurnberg2009-03-231-1/+1
| |\ \ \ \ \ | | |/ / / /