summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 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 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-0/+2
|\ \ \ \ | |/ / /
| * | | Fixed some compiler warningsMichael Widenius2012-12-191-0/+4
* | | | 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
| | | | |\ \ \ \
| * | | | \ \ \ \ 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
| | * | | | | | | | merge 5.1 => 5.5Tor Didriksen2012-07-261-3/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0Tor Didriksen2012-07-261-3/+7
| | * | | | | | | | Bug #12615411 - server side help doesn't work as first statementVenkata Sidagam2012-07-191-3/+11
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Bug #12615411 - server side help doesn't work as first statementVenkata Sidagam2012-07-191-3/+11
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-3/+22
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-3/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | MWL#182: Explain running statements: merge with 5.5-mainSergey Petrunya2012-08-121-3/+22
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-253-21/+91
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2012-06-151-3/+22
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-3/+22
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-3/+22
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ MWL#182: Explain running statementsSergey Petrunya2011-10-271-3/+22
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | MWL#182: Explain running statementsSergey Petrunya2011-09-241-3/+22
* | | | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-10-042-17/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-11/+31
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Automatic mergeMichael Widenius2012-09-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Automatic mergeMichael Widenius2012-09-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Added function last_value() which returns the last value but evalutes all arg...Michael Widenius2012-09-051-0/+1
* | | | | | | | | | | | | | | | | MDEV-225: Replace with dummy events an event that is not understood by a slav...unknown2012-06-221-0/+13
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Automatic merge with 5.5Michael Widenius2012-09-014-30/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | MDEV-448 Memory loss warnings in mysqldump when more than one schema is dumped Sergei Golubchik2012-08-291-2/+5
| * | | | | | | | | | | | | | | Merge from 5.3unknown2012-08-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | merge from 5.2unknown2012-08-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
View Lorry Controller Status