summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| | |\ \ \ | | | |/ /
| | | * | Bug#39663 mysqltest: --enable_info, affected_rows and ps-protocol brokenFrazer Clement2009-10-051-1/+11
| | * | | automergeGeorgi Kodinov2009-10-042-4/+4
| | |\ \ \
| | | * \ \ Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-281-1/+1
| | | |\ \ \
| | | * | | | Fix bug#46980Joerg Bruehe2009-09-172-4/+4
| | | | |_|/ | | | |/| |
| | * | | | Bug #46998 mysqlbinlog can't output BEGIN even if the database is included i...unknown2009-09-301-1/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug #46998 mysqlbinlog can't output BEGIN even if the database is included i...unknown2009-09-301-1/+4
| | | * | | Merge bug#42850 to 5.0Magnus Blåudd2009-09-281-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Addition to Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabledSatya B2009-09-041-1/+2
| | | * | | Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for Satya B2009-09-031-0/+1
| | * | | | BUG#43579 mysql_upgrade tries to alter log tables on replicated database unknown2009-09-282-0/+46
| | * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-232-3/+8
| | * | | | automergeGeorgi Kodinov2009-09-231-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | change c++ comment to c commenthery2009-09-091-1/+1
| | | |/ /
| | * | | automergeGeorgi Kodinov2009-09-181-18/+71
| | |\ \ \ | | | | |/ | | | |/|
| | | * | second merge from main, with adaptionsBjorn Munch2009-09-025-56/+127
| | | |\ \
| | | * \ \ first merge from mainBjorn Munch2009-09-0211-118/+294
| | | |\ \ \
| | | * | | | Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works ...Bjorn Munch2009-09-021-10/+46
| | | * | | | mergeBjorn Munch2009-09-011-2/+7
| | | |\ \ \ \
| | | | * | | | Bug #39003 mtr's diff_files command failed in pushbuild without printing a re...Bjorn Munch2009-08-191-2/+7
| | | * | | | | Bug #46164 memory leak in mysqltest after parse error with --debugBjorn Munch2009-08-181-3/+4
| | | |/ / / /
| | | * | | | Bug #44012 mtr: test cases that are not supposed to return output always failBjorn Munch2009-08-111-3/+14
| | * | | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-1/+6
| | | |_|/ / | | |/| | |
* | | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+0
* | | | | | Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build)...Michael Widenius2009-11-261-3/+2
* | | | | | Fixed typos of --engine help text.Hakan Kuecuekyilmaz2009-11-111-2/+2
|/ / / / /
* | | | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-065-54/+125
|\ \ \ \ \
View Lorry Controller Status