summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-102-16/+25
|\
| * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-102-17/+25
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-081-1/+1
|\ \ | |/
| * Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-081-1/+1
| |\
| | * Bug#53906: Stray semicolon in my_sys.h corrupts macro function definition of ...Davi Arnaut2010-06-081-1/+1
| * | merge mysql-5.1 -> mysql-5.1-bugteamGeorgi Kodinov2010-06-012-5/+15
| |\ \
| | * | Bug#53593: Add some instrumentation to improve Valgrind sensitivityMarko Mäkelä2010-05-202-5/+15
* | | | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-077-13/+52
|\ \ \ \
| * | | | Post-merge fix: header is used by the client API. Obvious in retrospect.Davi Arnaut2010-06-052-4/+6
| * | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-314-0/+14
| * | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-016-24/+39
| |\ \ \ \
| | * | | | Backport: remove dead code.Davi Arnaut2010-05-281-6/+2
| | * | | | Backport: Remove unused and ancient files, functions, and facilities.Davi Arnaut2010-05-281-1/+0
| | * | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-284-17/+37
| | |\ \ \ \
| * | \ \ \ \ Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-05-271-0/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-261-0/+11
| * | | | | | Merge mysql-trunk-innodb from bk-internal into my local treeVasil Dimov2010-05-212-5/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge a change from mysql-5.1-innodb:Marko Mäkelä2010-05-202-5/+15
| * | | | | | merge from mysql-trunk-runtimeJon Olav Hauglid2010-05-211-1/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Clean-up, give better names, add comments toKonstantin Osipov2010-05-061-1/+8
* | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-271-0/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | bug#49968: Properly define HAVE_ERRNO_AS_DEFINE for the appropriateJonathan Perkin2010-05-251-0/+4
| | |_|/ / | |/| | |
* | | | | 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