summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+1
|\
| * Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+1
| |\
| | * BUG#58246: INSTALL PLUGIN not secure & crashableMats Kindahl2010-12-011-0/+1
* | | merge with 5.1Sergei Golubchik2010-09-111-21/+21
|\ \ \ | |/ /
| * | to simpliy and unify the codeSergei Golubchik2010-09-111-27/+17
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-23/+33
| |\ \ | | |/
| | * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-141-1/+1
| | * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-141-3/+0
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-11/+0
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-7/+14
* | | Automerge with 5.1Michael Widenius2010-08-251-4/+4
|\ \ \ | |/ /
| * | Automatic mergeMichael Widenius2010-08-241-4/+4
| |\ \
| | * | Increase some very old limits.Michael Widenius2010-08-241-2/+2
| |/ /
* | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-2/+6
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+6
| |\ \ | | |/
| | * Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-2/+2
| | * bug#49968: Properly define HAVE_ERRNO_AS_DEFINE for the appropriateJonathan Perkin2010-05-251-0/+4
* | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+3
|\ \ \ | |/ /
| * | Fixes for Opensolaris (to get buildbot green)Michael Widenius2010-06-231-0/+3
* | | merge 5.1->5.2Sergei Golubchik2010-06-011-7/+3
|\ \ \ | |/ /
| * | Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-261-6/+2
| * | Merge with MySQL 5.1.47Michael Widenius2010-05-261-1/+1
| |\ \ | | |/
| | * Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+1
* | | fixes for windows buildsSergei Golubchik2010-04-021-1/+4
* | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-2/+12
|/ /
* | Fix some compiler warnings seen in Buildbot.unknown2010-03-101-3/+3
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+1
|\ \ | |/
| * merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-1/+1
| |\
| | * Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-0/+3
| * | Merge from 5.0Staale Smedseng2009-09-171-6/+0
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-6/+0
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+19
|\ \ \ | |/ /
| * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-0/+19
| |\ \ | | |/
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-0/+13
| | * MySQL 5.0 backport of Chad Miller's patch for Bug#34309:Davi Arnaut2009-05-301-1/+0
* | | MWL#17: Table elimination: fixes for windowsSergey Petrunya2009-09-161-0/+1
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
|\ \ \
| * | | MWL#17: Table-eliminationSergey Petrunya2009-09-011-2/+1
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-38/+62
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-1/+1
| |\ \
| | * | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+13
| |/ /
| * | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
| |\ \ | | |/
| | * auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| | |\
| | | * cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-34/+35
| | * | Automerge.Alexey Kopytov2009-03-251-2/+12
| | |\ \ | | | |/ | | |/|
| * | | Manual merge.Alexey Kopytov2009-03-251-3/+13
| |\ \ \ | | | |/ | | |/|
| | * | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
* | | | Fixed problems in mergeMichael Widenius2009-05-191-8/+8
|\ \ \ \
| * | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-8/+8