summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Bug#51878 Build break in HPUX involving mysql_prlock on a clientMarc Alff2010-03-091-0/+16
* Bug#51295 Build warnings in mdl.ccMarc Alff2010-03-071-1/+265
* Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-03-042-18/+58
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-022-5/+60
| |\
| * | Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-281-12/+58
| * | Bug#41103 6.0 Windows embedded-server tests failAlexey Botchkov2010-02-251-6/+0
* | | A joint patch for:Alexander Barkov2010-03-041-0/+1
| |/ |/|
* | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-252-3/+3
|\ \ | |/
| * Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-2313-29/+359
| |\
| * | Fix compiler warnings in my_atomic.hKonstantin Osipov2010-02-192-3/+3
* | | Merging WL#1213 into mysql-next-mr-bar2Alexander Barkov2010-02-242-5/+60
|\ \ \ | |_|/ |/| |
| * | Backporting WL#1213Alexander Barkov2010-02-242-5/+60
* | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-212-0/+9
|\ \ \
| * | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-202-0/+9
| |/ /
* | | mergeVladislav Vaintroub2010-02-181-0/+17
|\ \ \ | |/ /
| * | Re-adding 'include/probes_mysql_nodtrace.h' removed by accidentAlexander Nozdrin2010-02-171-0/+129
| * | Merging from mysql-next-mrAlexander Barkov2010-02-176-137/+76
| |\ \ | | |/
| * | Post-fix for WL#3090.Alexander Barkov2010-02-161-1/+1
| * | WL#3090 Japanese Character Set adjustmentsAlexander Barkov2010-02-151-0/+17
* | | mergeVladislav Vaintroub2010-02-165-8/+76
|\ \ \ | | |/ | |/|
| * | 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-1/+8
| |\ \ \ | | |/ / | |/| / | | |/
| * | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-112-4/+48
| * | Merge next-mr -> next-4284.Konstantin Osipov2010-02-068-213/+341
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+6
| |\ \ \
| * \ \ \ Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-3/+11
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-1/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0320-282/+139
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-023-5/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-029-16/+96
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0214-83/+157
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-1515-18/+3811
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge with next-4284.Konstantin Osipov2009-12-101-129/+0
| * | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-032-1/+4
| * | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-035-24/+160
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-2/+3
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+19
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-021-0/+2
* | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-132-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marcMarc Alff2010-02-053-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-275-205/+336
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug#44210 Performance schema: pool-of-threads threads instrumentation is missingMarc Alff2010-01-262-1/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | mergeVladislav Vaintroub2010-02-063-8/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merging from 5.0-bugteamStaale Smedseng2010-01-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-255-205/+336
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status