summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-04-154-100/+118
|\
| * 5.5 mergeSergei Golubchik2013-04-141-71/+96
| |\
| | * 5.3 mergeSergei Golubchik2013-04-121-71/+96
| | |\
| | | * 5.2 mergeSergei Golubchik2013-04-111-71/+96
| | | |\
| | | | * 5.1 mergeSergei Golubchik2013-04-111-64/+89
| | | | |\
| | | | | * MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-061-64/+89
| * | | | | my_dir() cleanupSergei Golubchik2013-04-071-9/+3
| * | | | | 5.5 mergeSergei Golubchik2013-03-273-20/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-283-20/+13
| | |\ \ \ \
| | | * \ \ \ merge 5.1 => 5.5Tor Didriksen2012-12-211-1/+1
| | | |\ \ \ \
| | | | * | | | Bug#16027468 ADDRESSSANITIZER BUG IN MYSQLTESTTor Didriksen2012-12-201-2/+1
| | | * | | | | Bug#13639125 DELIMITER STRIPS THE NEXT NEW LINENirbhay Choubey2012-12-121-5/+7
| | | * | | | | BUG#15891524: RLI_FAKE MODE IS NOT UNSET AFTER BINLOG REPLAYNuno Carvalho2012-11-201-0/+4
| | | * | | | | Bug#14463669 FAILURE TO CORRECTLY PARSE ROUTINES INVamsikrishna Bhagi2012-11-191-15/+2
| | | * | | | | BUG#11762933: MYSQLDUMP WILL SILENTLY SKIP THE `EVENT`Anirudh Mangipudi2012-11-091-1/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | BUG#11762933: MYSQLDUMP WILL SILENTLY SKIP THE `EVENT`Anirudh Mangipudi2012-11-091-1/+2
| | | * | | | | Merge of fix for Bug#14645196 from mysql-5.1Nirbhay Choubey2012-09-211-2/+89
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Bug#14645196 MYSQL CLIENT'S USE COMMAND FAILSNirbhay Choubey2012-09-211-2/+89
| | * | | | | | MDEV-4181 : ensure mysql client's beep works on all Windows systems.Vladislav Vaintroub2013-02-201-0/+6
* | | | | | | | 10.0-base mergeSergei Golubchik2013-01-317-23/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-01-293-11/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.3 mergeSergei Golubchik2013-01-252-3/+6
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | 5.2 mergeSergei Golubchik2013-01-252-3/+6
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | MDEV-4040 Replace deprecated SET OPTION syntax in mysqldumpSergei Golubchik2013-01-251-2/+2
| | | | * | | | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-1/+4
| | * | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-4/+6
| | * | | | | | Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-111-1/+8
| | * | | | | | MDEV-3883 Show global status not in orderSergei Golubchik2013-01-081-3/+3
| * | | | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-236-11/+11
| * | | | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-236-14/+16
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed some compiler warningsMichael Widenius2012-12-191-0/+4
* | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-1611-54/+66
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-0911-49/+67
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-0811-49/+67
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-0611-47/+67
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/|
| | | | * | | | Merge into latest 5.2.unknown2012-08-241-1/+1
| | | | |\ \ \ \
| | | * | \ \ \ \ Merge into latest 5.3unknown2012-08-241-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ 5.2 merge.Sergei Golubchik2012-08-223-14/+88
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | 5.1 mergeSergei Golubchik2012-08-223-14/+88
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | merge with MySQL 5.1.65Sergei Golubchik2012-08-223-14/+88
| | | | | |\ \ \ \ \
* | | | | | \ \ \ \ \ merge with 5.5Sergei Golubchik2012-11-0311-53/+63
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-1611-53/+64
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | upmerge from mysql-5.1=>mysql-5.5Rohit Kalhans2012-08-081-1/+12
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDINRohit Kalhans2012-08-081-1/+12
| | * | | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-0710-23/+20
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-0710-20/+20