Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-base -> 10.0 | Igor Babaev | 2013-04-17 | 3 | -21/+9 |
|\ | |||||
| * | Merge 5.5->10.0-base | unknown | 2013-04-17 | 3 | -21/+9 |
| |\ | |||||
| | * | compiler warnings | Sergei Golubchik | 2013-04-14 | 3 | -21/+9 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 19 | -67/+51 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 3 | -10/+5 |
| |\ \ | | |/ | |||||
| | * | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 3 | -10/+5 |
| * | | put status variables in the proper pluginname_ scope | Sergei Golubchik | 2013-04-09 | 1 | -6/+1 |
| * | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -7/+1 |
| * | | my_dir() cleanup | Sergei Golubchik | 2013-04-07 | 3 | -3/+3 |
| * | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 13 | -36/+37 |
| * | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 2 | -5/+4 |
| |\ \ | | |/ | |||||
| | * | Automatic merge | Michael Widenius | 2013-03-01 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Added support for --crash-script in mysqld_safe. | Michael Widenius | 2013-02-28 | 1 | -1/+0 |
| | * | | 5.3->5.5 merge | Sergei Golubchik | 2013-02-28 | 1 | -4/+4 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | 5.2 -> 5.3 | Sergei Golubchik | 2013-02-28 | 1 | -4/+4 |
| | | |\ | |||||
| | | | * | 5.1 -> 5.2 merge | Sergei Golubchik | 2013-02-28 | 1 | -4/+4 |
| | | | |\ | |||||
| | | | | * | MDEV-4203 : fix maria SE repair functions (wrong operator precedence) | Vladislav Vaintroub | 2013-02-26 | 1 | -4/+4 |
| | | | * | | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -1/+1 |
| | | | |\ \ | | | | | |/ | |||||
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 13 | -23/+28 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed MDEV-3890: Server crash inserting record on a temporary table after tru... | Michael Widenius | 2013-01-25 | 1 | -0/+3 |
| * | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 11 | -17/+17 |
| * | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 12 | -23/+25 |
* | | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 4 | -11/+39 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 4 | -11/+39 |
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 5 | -42/+44 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+0 |
| * | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 6 | -41/+50 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 4 | -40/+44 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ... | Sergei Golubchik | 2012-11-17 | 2 | -6/+7 |
| | | * | | | Merge 5.2 -> 5.3 | unknown | 2012-11-01 | 2 | -35/+37 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge 5.1 -> 5.2 | unknown | 2012-11-01 | 2 | -35/+37 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_d... | Michael Widenius | 2012-10-31 | 1 | -3/+4 |
| | | | | * | Fixed MDEV-647,LP:986261 - Aria unit tests fail at ma_test2 | Michael Widenius | 2012-10-31 | 1 | -32/+33 |
| * | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -6/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -6/+0 |
* | | | | | | | set username=hostname=NULL in the P_S for the aria background checkpoint thread | Sergei Golubchik | 2012-11-05 | 1 | -0/+4 |
* | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_U... | Vladislav Vaintroub | 2012-10-30 | 1 | -1/+5 |
| * | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | |||||
| | * | | | | merge | Sergei Golubchik | 2012-09-27 | 2 | -1/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge from 5.1. | unknown | 2012-09-26 | 3 | -4/+5 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Fix some failures in 5.1 Buildbot: | unknown | 2012-09-26 | 2 | -3/+4 |
* | | | | | | workaround for gcc 4.3.2 bug on lenny-x86 at -O3 | Sergei Golubchik | 2012-10-29 | 1 | -0/+3 |
* | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 10 | -14/+50 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | makes mi_test_all.sh & ma_test_all.sh working (MDEV-285) | unknown | 2012-09-25 | 2 | -3/+12 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 6 | -2/+16 |
| * | | | | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 2 | -0/+4 |
| * | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -3/+0 |
| * | | | | Merge 5.3->5.5 | Sergey Petrunya | 2012-07-18 | 2 | -6/+23 |
| |\ \ \ \ | | |/ / / |