summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111Alexander Nozdrin2010-06-252-1/+9
* Bug #50124 Rpl failure on DROP table with concurrent txn/non-txnJon Olav Hauglid2010-06-251-2/+6
* Backport of Bug#53236 Segfault in DTCollation::set(DTCollation&)Tor Didriksen2010-06-231-4/+2
* Bug #30584: delete with order by and limit clauses does notGleb Shchepa2010-06-2310-330/+657
* Fix ~1000 warnings class/struct mismatch.Vladislav Vaintroub2010-06-221-1/+1
* Auto-merge from mysql-trunk-stage.Alexander Nozdrin2010-06-212-6/+6
|\
| * mergeDaniel Fischer2010-06-182-6/+6
| |\
| | * MergeDaniel Fischer2010-04-21114-7988/+13453
| | |\
| | | * Fix Windows data directory, from wlad.Jonathan Perkin2010-04-201-1/+2
| | * | Fix a couple fo things replated to MSIVladislav Vaintroub2010-02-161-2/+2
| | * | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-102-4/+4
* | | | WL#5349 Change default storage engine to InnoDBMagne Mahre2010-06-171-0/+8
* | | | Merge.Konstantin Osipov2010-06-171-5/+0
|\ \ \ \
| * | | | Small clean-up and pre-requisite for makingDmitry Lenev2010-06-161-5/+0
* | | | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-1749-448/+806
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Bug#52208: gis fails on some platforms (Solaris, HP-UX, Linux)Alexey Kopytov2010-06-151-3/+3
| |\ \ \
| | * | | Backport of the patch for bug52208 to 5.1 since theAlexey Kopytov2010-06-151-3/+3
| * | | | Manual merge from mysql-5.1-bugteam.Alexey Kopytov2010-06-121-8/+14
| |\ \ \ \ | | |/ / /
| | * | | Addendum for the fix for bug #42064:Alexey Kopytov2010-06-121-7/+12
| | * | | Automerge.Alexey Kopytov2010-06-111-3/+20
| | |\ \ \
| | * \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-1111-60/+125
| | |\ \ \ \
| * | | | | | Fixed ha_ndbcluster_binlog.cc to use Parser_state::init().Alexey Kopytov2010-06-121-2/+3
| * | | | | | Automerge.Ramil Kalimullin2010-06-111-3/+20
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Automerge.Ramil Kalimullin2010-06-111-3/+20
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix for bug #54007: assert in ha_myisam::index_next, HANDLERRamil Kalimullin2010-06-091-3/+20
| * | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-1113-46/+122
| |\ \ \ \ \ \
| | * \ \ \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-1111-61/+126
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-2111-61/+126
| * | | | | | Merge of fix for bug#53859.Martin Hansson2010-06-111-13/+28
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&,Martin Hansson2010-06-111-13/+28
| * | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-1030-339/+402
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-1024-207/+213
| | * | | | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-104-517/+618
| | | |/ / / | | |/| | |
| * | | | | mergeGeorgi Kodinov2010-06-092-1/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | MergeGeorgi Kodinov2010-06-092-1/+11
| | |\ \ \ \
| | | * | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status Georgi Kodinov2010-04-072-1/+11
| | * | | | | automergeKristofer Pettersson2010-06-081-2/+2
| | |\ \ \ \ \
| * | \ \ \ \ \ AutomergeKristofer Pettersson2010-06-082-3/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Addendum to merge of Bug#52315 to mysql-trunk-merge : Georgi Kodinov2010-06-081-1/+0
| | * | | | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-081-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2010-06-081-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#53933 crash when using uncacheable subquery in the having clause of outer...Sergey Glukhov2010-06-081-2/+2
| * | | | | | | | | merge 5.1-bugteam => trunk-mergeKristofer Pettersson2010-06-081-4/+30
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Bug#53191 Lock_time in slow log is negative when logging stored routinesKristofer Pettersson2010-06-081-8/+37
| | |/ / / / / /
| * | | | | | | merge and typo fixGeorgi Kodinov2010-06-072-4/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeGeorgi Kodinov2010-06-071-2/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Addendum to the fix for bug #52315: need to set a proper shutdown typeGeorgi Kodinov2010-06-071-2/+6
| * | | | | | | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-0771-950/+1160
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Automerge.Ramil Kalimullin2010-06-041-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Automerge.Ramil Kalimullin2010-06-045-1/+43
| | |\ \ \ \ \ \ \
View Lorry Controller Status