Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+1 |
|\ | |||||
| * | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+1 |
| |\ | |||||
| | * | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 1 | -0/+1 |
* | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -21/+21 |
|\ \ \ | |/ / | |||||
| * | | to simpliy and unify the code | Sergei Golubchik | 2010-09-11 | 1 | -27/+17 |
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -23/+33 |
| |\ \ | | |/ | |||||
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-07-14 | 1 | -1/+1 |
| | * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-07-14 | 1 | -3/+0 |
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -11/+0 |
| | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -7/+14 |
* | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Automatic merge | Michael Widenius | 2010-08-24 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Increase some very old limits. | Michael Widenius | 2010-08-24 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -2/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+6 |
| |\ \ | | |/ | |||||
| | * | Bug#54667: Unnecessary signal handler redefinition | Alexey Kopytov | 2010-07-01 | 1 | -2/+2 |
| | * | bug#49968: Properly define HAVE_ERRNO_AS_DEFINE for the appropriate | Jonathan Perkin | 2010-05-25 | 1 | -0/+4 |
* | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -0/+3 |
* | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -7/+3 |
|\ \ \ | |/ / | |||||
| * | | Added macros to inform valgrind that memory is uninitialized | Michael Widenius | 2010-05-26 | 1 | -6/+2 |
| * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Bug #47095: Can't open_files_limit really be larger than 65535? | Georgi Kodinov | 2010-04-09 | 1 | -1/+1 |
* | | | fixes for windows builds | Sergei Golubchik | 2010-04-02 | 1 | -1/+4 |
* | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -2/+12 |
|/ / | |||||
* | | Fix some compiler warnings seen in Buildbot. | unknown | 2010-03-10 | 1 | -3/+3 |
* | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+3 |
| * | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+19 |
|\ \ \ | |/ / | |||||
| * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -0/+19 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -0/+13 |
| | * | MySQL 5.0 backport of Chad Miller's patch for Bug#34309: | Davi Arnaut | 2009-05-30 | 1 | -1/+0 |
* | | | MWL#17: Table elimination: fixes for windows | Sergey Petrunya | 2009-09-16 | 1 | -0/+1 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -2/+1 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -38/+62 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -1/+1 |
| * | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -0/+13 |
| |/ / | |||||
| * | | merge -5.0 into -5.1 (minor conflicts resolved) | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
| |\ \ | | |/ | |||||
| | * | auto-merge -build into -bugteam | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
| | |\ | |||||
| | | * | cmd-line-utils/libedit/readline/readline.h | unknown | 2009-03-19 | 1 | -34/+35 |
| | * | | Automerge. | Alexey Kopytov | 2009-03-25 | 1 | -2/+12 |
| | |\ \ | | | |/ | | |/| | |||||
| * | | | Manual merge. | Alexey Kopytov | 2009-03-25 | 1 | -3/+13 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can | Alexey Kopytov | 2009-03-24 | 1 | -2/+12 |
* | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -8/+8 |