summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* mergedSergei Golubchik2010-03-156-19/+59
|\
| * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-046-19/+59
| |\
| | * Bug #49223 Change help description for mysqldumpStaale Smedseng2010-01-271-1/+1
| | * WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-273-5/+9
| | * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-215-10/+41
| | * mergeGeorgi Kodinov2009-12-241-1/+1
| | |\
| | | * Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-1/+1
| | * | Manual merge.Davi Arnaut2009-12-181-2/+2
| | |\ \ | | | |/
| | | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-2/+2
| | | * 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
| | * | | This is a patch for bug#41569.unknown2009-12-031-0/+4
* | | | | merge 5.1->5.2unknown2010-02-014-21/+32
|\ \ \ \ \ | |/ / / /
| * | | | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-15/+22
| * | | | Fixed compiler warnings & failing test casesMichael Widenius2010-01-281-1/+3
| * | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-5/+3
| |\ \ \ \ | | |/ / /
| | * | | merge to mysql-5.1-bugteamSatya B2009-11-261-3/+1
| | |\ \ \
| | | * \ \ auto-mergeTatiana A. Nurnberg2009-11-241-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
| | |/ / / /
| | * | | | Post-merge fixes: fix typo and remove unused variables.Davi Arnaut2009-11-211-4/+1
| * | | | | Fixed bug where mysqlbinlog hold up multiple connections to MySQL when using ...Michael Widenius2010-01-091-0/+4
* | | | | | Merge with 5.1Michael Widenius2010-01-044-68/+64
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix test suite so that it works when doing configure --without-ucaMichael Widenius2009-12-271-1/+5
| * | | | | MergeMichael Widenius2009-12-034-67/+59
| |\ \ \ \ \
| | * \ \ \ \ Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable...Michael Widenius2009-12-034-67/+59
| | |\ \ \ \ \
| | | * \ \ \ \ Merge with MySQL 5.1, with following additions:Michael Widenius2009-11-117-62/+272
| | | |\ \ \ \ \ | | | | |/ / / /
* | | | | | | | merge 5.1-> 5.2unknown2009-12-087-68/+276
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-307-62/+272
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-167-62/+272
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | mergeVladislav Vaintroub2009-11-033-38/+57
| | | |\ \ \ \
| | | | * \ \ \ mergeGeorgi Kodinov2009-10-301-24/+28
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | merge from 5.0-mainGeorgi Kodinov2009-10-301-24/+28
| | | | | |\ \ \
| | | | | | * \ \ Merge from mysql-5.0.87-releaseunknown2009-10-261-24/+28
| | | | | | |\ \ \
| | | | | | | * | | Added make targets 'test-bt-fast' and 'test-bt-debug-fast'Hery Ramilison2009-10-151-27/+28
| | | | * | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-281-5/+7
| | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | merged 5.1-main-> 5.1-bugteamGeorgi Kodinov2009-10-231-0/+1
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge from 5.1 mainBjorn Munch2009-10-167-12/+80
| | | | | |\ \ \ \ \
| | | | | * | | | | | Bug #47218 mysqltest ignores "error" command inside if inside loopBjorn Munch2009-10-081-0/+1
| | | | * | | | | | | auto-mergeTatiana A. Nurnberg2009-10-201-7/+5
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-201-7/+5
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | | * | | | | | | 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 #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-032-0/+71
| | | |/ / / / /
| | | * | | | | Merge 5.0-bugteam-> 5.1-bugteamFrazer Clement2009-10-081-3/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Fix compile break from bug#39663 fixFrazer Clement2009-10-081-3/+2
| | | | | |/ / | | | | |/| |
| | | * | | | Merge 5.0-bugteam->5.1 bugteamFrazer Clement2009-10-051-1/+11
| | | |\ \ \ \ | | | | |/ / /