summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Fix manual-merge (2nd attempt).Alexander Nozdrin2009-11-101-2/+0
* Fix manual-merge.Alexander Nozdrin2009-11-091-28/+21
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-063-34/+126
|\
| * Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-24/+28
| |\
| | * 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
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-5/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-281-5/+7
| * | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-6/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | merged 5.1-main-> 5.1-bugteamGeorgi Kodinov2009-10-231-0/+1
| | |\ \ \ \
| | | * \ \ \ merge from 5.1 mainBjorn Munch2009-10-167-12/+80
| | | |\ \ \ \
| | * | \ \ \ \ auto-mergeTatiana A. Nurnberg2009-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
| | | | |_|/ / | | | |/| | |
| * | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+71
| |\ \ \ \ \ \
| | * | | | | | Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-032-0/+71
| * | | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-7/+5
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-201-7/+5
| | | |/ / / / | | |/| | | |
| * | | | | | new merge from trunkBjorn Munch2009-10-227-11/+74
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-5/+17
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-291-5/+17
| |\ \ \ \ \ \ \
| | * | | | | | | WL#4991 mysql_upgrade --fix-privilege-tablesAlexey Botchkov2009-10-281-5/+17
| * | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-285-28/+21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-273-2/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-231-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-227-7/+78
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-288-30/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-273-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-223-2/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | 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
| * | | | | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-236-6/+70
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-215-28/+21
* | | | | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-237-6/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | new merge from next-mrBjorn Munch2009-10-226-6/+69
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-212-1/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-192-4/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | 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
| | | | | |_|_|_|_|/ | | | | |/| | | | |
| | * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-146-5/+69
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | 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
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ 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
| | | | |\ \ \ \ \ \ \
View Lorry Controller Status