summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-37/+126
|\
| * 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
| | |\ \ \ \
| | * \ \ \ \ 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
| | | | |/ / | | | |/| |
| * | | | | Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-032-0/+71
* | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugsAndrei Elkin2009-11-201-1/+18
* | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-131-1/+1
* | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-1/+1
|\ \ \ \ \ \
| * | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-1/+1
* | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-067-12/+81
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | merge from 5.1 mainBjorn Munch2009-10-167-12/+80
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mergeGeorgi Kodinov2009-10-141-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | "MySQL Network" => "MySQL Enterprise"Kent Boortz2009-10-081-1/+1
| | * | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | * | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-1/+6
| * | | | Bug #47218 mysqltest ignores "error" command inside if inside loopBjorn Munch2009-10-081-0/+1
| | |/ / | |/| |
* | | | Backport BUG#38468 Memory leak detected when using mysqlbinlog utilityHe Zhenxing2009-10-021-2/+2
* | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-232-0/+10
|/ / /
* | | second merge from main, with adaptionsBjorn Munch2009-09-025-56/+127
|\ \ \ | |/ /
| * | manual mergeTatiana A. Nurnberg2009-08-311-32/+100
| |\ \ | | |/
| | * Bug#35132: MySQLadmin --wait ping always crashes on Windows systemsTatiana A. Nurnberg2009-08-311-29/+99
| * | Merge from 5.0 for 43414Staale Smedseng2009-08-284-12/+15
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-285-19/+27
| * | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-282-12/+12
* | | first merge from mainBjorn Munch2009-09-0211-118/+294
|\ \ \ | |/ /
| * | Additional post-commit fix (bug #30946): server versionGleb Shchepa2009-08-041-1/+1