summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-11-032-0/+71
|\
| * Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-032-0/+71
* | 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-236-6/+70
| |\ \ \
| * | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-215-28/+21
* | | | | 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-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | new merge from next-mrBjorn Munch2009-10-226-6/+69
| |\ \ \ \
| * \ \ \ \ merge from next-mrBjorn Munch2009-10-212-1/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | merge from next-mrBjorn Munch2009-10-187-27/+20
| |\ \ \ \ \
| * \ \ \ \ \ merge from mtr-51Bjorn Munch2009-10-081-0/+1
| |\ \ \ \ \ \
| | * | | | | | Bug #47218 mysqltest ignores "error" command inside if inside loopBjorn Munch2009-10-081-0/+1
| | | |_|_|/ / | | |/| | | |
* | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-227-7/+78
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-212-1/+9
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-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
| | | |\ \ \ \
| | | * | | | | 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
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | automergeGeorgi Kodinov2009-09-181-18/+71
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Backporting of Bug#40128 from 6.0 to next-mr.Alexander Nozdrin2009-10-091-1/+5
* | | | | | | | Pull from mysql-next-mr.Alexander Nozdrin2009-10-091-17/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-081-17/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-7/+0
| | * | | | | | | Backport of the patch Vladislav Vaintroub2009-09-301-10/+10
| | * | | | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-9/+9
* | | | | | | | | A backport of a patch for Bug#35297.Alexander Nozdrin2009-10-081-112/+78
|/ / / / / / / /
* | | | | | | | Merge "trunk-build" up into "next-mr".Joerg Bruehe2009-09-303-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-283-5/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-281-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | change c++ comment to c commenthery2009-09-091-1/+1
| | | | |_|_|/ | | | |/| | |