summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-14/+0
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1115-268/+217
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-123-25/+108
| |\
| | * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+0
| | |\
| | * | 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
| | | |\ \
| | | * \ \ Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-5/+7
| | | |\ \ \
| | | * \ \ \ Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-6/+20
| | | |\ \ \ \
| | | * \ \ \ \ Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+71
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-7/+5
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ new merge from trunkBjorn Munch2009-10-227-11/+74
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq...Alexey Botchkov2009-11-111-2/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-052-185/+120
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-5/+17
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-291-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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-237-6/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | A backport of a patch for Bug#35297.Alexander Nozdrin2009-10-081-112/+78
| * | | | | | | | | | | | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+0
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | WL#4991 mysql_upgrade --fix-privilege-tablesAlexey Botchkov2009-10-281-5/+17
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-146-5/+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
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-215-28/+21
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-1/+9
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
View Lorry Controller Status