summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2010-05-201-3/+0
|\
| * Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-0/+10
|\ \
| * \ Manual merge.Davi Arnaut2010-04-291-0/+10
| |\ \
| | * | Bug#50974: Server keeps receiving big (> max_allowed_packet) packets indefini...Davi Arnaut2010-04-291-0/+10
* | | | Manual merge of local mysql-trunk-merge with bk-internal.Alexey Kopytov2010-05-071-1/+1
|\ \ \ \
| * \ \ \ Manual merge from mysql-trunk.Alexander Nozdrin2010-05-071-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Include mysql/innodb_priv.h into 'make dist'.Alexander Nozdrin2010-05-041-1/+1
* | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-302-16/+26
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge fix for BUG39053 to 5.1-bugteam.Sergey Vojtovich2010-04-142-16/+26
| |\ \ \
| | * | | BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-142-16/+26
* | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-04-2710-13/+99
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merging with mysql-trunk-bugfixingMats Kindahl2010-04-219-12/+96
| |\ \ \ \
| | * \ \ \ Merge the changes of the 5.5.3-m3 release buildJoerg Bruehe2010-04-181-4/+13
| | |\ \ \ \
| | | * | | | Make the libraries we produce on Windows actually usableDaniel Fischer2010-04-161-4/+13
| | * | | | | Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing.Sergey Vojtovich2010-04-151-3/+4
| | |\ \ \ \ \
| | | * | | | | BUG#47059 - In audit plugin I cannot see the event subclasses,Sergey Vojtovich2010-04-151-3/+4
| | * | | | | | Post-fix for Bug#13174.Alexander Nozdrin2010-04-131-2/+8
| | * | | | | | Backport of:Konstantin Osipov2010-04-137-5/+73
| * | | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-1/+3
| |/ / / / / /
* | | | | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-1920-20/+182
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-9/+7
| * | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-0/+35
| * | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-3119-11/+140
* | | | | | | Automerge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+1
| | |_|/ / | |/| | |
* | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2451-848/+6151
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /