summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base -> 10.0-montySergei Golubchik2012-10-196-49/+220
|\
| * 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
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge from 5.1.unknown2012-08-241-1/+1
| | | | |\ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ Automatic mergeMichael Widenius2012-08-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed compiler warnings (A few of these was bugs)Michael Widenius2012-08-131-1/+1
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-093-14/+66
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | undo the fix for MySQL Bug#12998841Sergei Golubchik2012-08-085-46/+1
| | | * | | | | | | | | | merge from 5.1 to 5.5Sujatha Sivakumar2012-07-101-1/+12
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-101-1/+12
| | | * | | | | | | | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-055-1/+46
| | | * | | | | | | | | | | Bug #11753490: 44939: sql dumps containing broad views fail when Georgi Kodinov2012-07-041-7/+28
| | | * | | | | | | | | | | merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-1/+3
| | | * | | | | | | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-292-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-2/+2
| | | * | | | | | | | | | | upmerge from mysql-5.1 branch -> mysql-5.5 branchRohit Kalhans2012-05-291-1/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Bug#11762667: MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUTRohit Kalhans2012-05-291-1/+20
| | | | * | | | | | | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY Venkata Sidagam2012-05-071-8/+50
| | * | | | | | | | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-4/+0
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Allow multiple error codes inside a variable in --error commandElena Stepanova2012-07-161-6/+27
| | * | | | | | | | | | | Export sys_errno and errno to variablesElena Stepanova2012-07-161-0/+4
| | * | | | | | | | | | | Fixed MDEV-385: mysqltest running with continue-on-error crashes on a non-SQL...Michael Widenius2012-07-101-1/+1
* | | | | | | | | | | | | fixes for test failuresSergei Golubchik2012-09-272-13/+12
* | | | | | | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-149-1/+34
* | | | | | | | | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-1/+20
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fixed compiler warningsMichael Widenius2012-07-061-1/+1
* | | | | | | | | | | | automatic merge with 5.5Michael Widenius2012-06-273-14/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge 5.3 -> 5.5Sergey Petrunya2012-06-201-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge 5.2->5.3Sergey Petrunya2012-06-181-4/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | 5.1 mergeSergei Golubchik2012-06-011-4/+7
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a blockSergei Golubchik2012-06-011-4/+7
| * | | | | | | | | | | various documentation updatesDaniel Bartholomew2012-06-181-1/+1
View Lorry Controller Status