summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Fixes from wladJonathan Perkin2010-03-181-4/+4
* Fix C++ style comments, they cause syntax errors in C file.Joerg Bruehe2010-03-131-3/+3
* A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-69/+10
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-023-9/+223
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-012-5/+219
| |\
| | * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-251-1/+1
| | |\
| | * \ Merging WL#1213 into mysql-next-mr-bar2Alexander Barkov2010-02-242-5/+219
| | |\ \
| | | * | Backporting WL#1213Alexander Barkov2010-02-242-5/+219
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-4/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-4/+4
| | |\ \ \
| | | * | | Recommit of Bug#49447.Staale Smedseng2010-02-041-4/+4
| | * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-0/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+9
* | | | | | Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-281-12/+44
|/ / / / /
* | | | | Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.Vladislav Vaintroub2010-02-221-1/+1
| |_|/ / |/| | |
* | | | mergeVladislav Vaintroub2010-02-163-45/+132
|\ \ \ \ | | |_|/ | |/| |
| * | | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-151-1/+0
| |\ \ \
| | * | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-151-1/+0
| * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-152-40/+42
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-16/+16
| * | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-062-3/+3
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-6/+6
| |\ \ \ \ \
| * | | | | | Bug #50821 Deadlock between LOCK TABLES and ALTER TABLEJon Olav Hauglid2010-02-041-3/+2
| * | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-033-5/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-034-172/+386
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-4/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-025-57/+85
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0232-409/+715
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for bug #48538 "Assertion in thr_lock() on LOAD DATA CONCURRENTJon Olav Hauglid2010-01-081-9/+20
| * | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-5/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-153-6/+76
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Backport of revno: 2617.68.18Jon Olav Hauglid2009-12-091-7/+25
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+7
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+13
| * | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-035-14/+1084
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+2
| * | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-021-6/+36
* | | | | | | | | | | | | | | remove use of undocumented __sparcv8plus - this macro does not seem to be def...Vladislav Vaintroub2010-02-141-4/+4
* | | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-132-26/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge mysql-next-mr-marc --> mysql-next-mr-bugfixingMarc Alff2010-02-051-17/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-052-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug#50337 --defaults-file=~/something doesn't work anymoreMarc Alff2010-01-251-17/+18
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-052-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug #50362 comp_err crashes during compilation on FreeBSD.Vladislav Vaintroub2010-01-201-23/+24
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-062-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-188-183/+398
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-242-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-241-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-195-56/+84
| | | |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status