summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* 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...2009-09-301-1/+4
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Bug #46998 mysqlbinlog can't output BEGIN even if the database is included i...2009-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 2009-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
| | | |\ \ \ \ \
| * | | \ \ \ \ \ merge from next-mrBjorn Munch2009-10-212-1/+9
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-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
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-161-57/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport of 2617.65.4 from 6.0-codebase.Konstantin Osipov2009-10-161-10/+9
| * | | | | | | | Backport of:Konstantin Osipov2009-10-161-47/+1
* | | | | | | | | Backporting patch for Bug#38992 from 6.0.Alexander Nozdrin2009-10-161-0/+19
|/ / / / / / / /
* | | | | | | | Backport of:Konstantin Osipov2009-10-142-12/+12
* | | | | | | | 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
| | | | |_|_|/ | | | |/| | |
| | * | | | | Fix bug#46980Joerg Bruehe2009-09-172-4/+4
| | | |_|/ / | | |/| | |
| | * | | | second merge from main, with adaptionsBjorn Munch2009-09-025-56/+127
| | |\ \ \ \
| | * \ \ \ \ first merge from mainBjorn Munch2009-09-0211-118/+294
| | |\ \ \ \ \
* | | | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-2/+2
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | mergeVladislav Vaintroub2009-09-235-75/+204
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | new merge from trunkBjorn Munch2009-09-185-57/+133
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-1/+6
| | | |_|/ / | | |/| | |
| | * | | | manual mergeTatiana A. Nurnberg2009-08-311-32/+100
| | |\ \ \ \ | | | | |_|/ | | | |/| |