summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-stage.Alexander Nozdrin2010-06-211-2/+2
|\
| * mergeDaniel Fischer2010-06-181-2/+2
| |\
| | * mergeDaniel Fischer2010-05-271-4/+13
| | |\
| | * \ MergeDaniel Fischer2010-04-2113-36/+513
| | |\ \
| | * | | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-2/+2
* | | | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-174-17/+30
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| | | |/ / / / / | | |/| | | | |
* | | | | | | | WL#5419 "LOCK_open scalability: make tdc_refresh_version Konstantin Osipov2010-06-111-3/+14
* | | | | | | | manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-0610-32/+81
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2010-05-201-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
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ 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
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-1920-20/+182
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ 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
| | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | A follow up patch for the fix for Bug#51263 "Deadlock between Konstantin Osipov2010-06-011-6/+0
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Clean-up, give better names, add comments toKonstantin Osipov2010-05-061-1/+8
|/ / / / / / / / /
* | | | | | | | | Include mysql/innodb_priv.h into 'make dist'.Alexander Nozdrin2010-05-041-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | 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
| |\ \ \ \ \ \ \