summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-base -> 10.0Igor Babaev2013-04-173-21/+9
|\
| * Merge 5.5->10.0-baseunknown2013-04-173-21/+9
| |\
| | * compiler warningsSergei Golubchik2013-04-143-21/+9
* | | 10.0-base mergeSergei Golubchik2013-04-1519-67/+51
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-04-143-10/+5
| |\ \ | | |/
| | * MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-283-10/+5
| * | put status variables in the proper pluginname_ scopeSergei Golubchik2013-04-091-6/+1
| * | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-7/+1
| * | my_dir() cleanupSergei Golubchik2013-04-073-3/+3
| * | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-0713-36/+37
| * | 5.5 mergeSergei Golubchik2013-03-272-5/+4
| |\ \ | | |/
| | * Automatic mergeMichael Widenius2013-03-011-1/+0
| | |\
| | | * Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+0
| | * | 5.3->5.5 mergeSergei Golubchik2013-02-281-4/+4
| | |\ \ | | | |/ | | |/|
| | | * 5.2 -> 5.3Sergei Golubchik2013-02-281-4/+4
| | | |\
| | | | * 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-4/+4
| | | | |\
| | | | | * MDEV-4203 : fix maria SE repair functions (wrong operator precedence)Vladislav Vaintroub2013-02-261-4/+4
| | | | * | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-1/+1
| | | | |\ \ | | | | | |/
* | | | | | 10.0-base mergeSergei Golubchik2013-01-3113-23/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-01-291-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed MDEV-3890: Server crash inserting record on a temporary table after tru...Michael Widenius2013-01-251-0/+3
| * | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-2311-17/+17
| * | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-2312-23/+25
* | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-104-11/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | The patch for the task mdev-539.Igor Babaev2012-12-204-11/+39
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-185-42/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-2/+0
| * | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-166-41/+50
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3->5.5 mergeSergei Golubchik2012-11-224-40/+44
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ...Sergei Golubchik2012-11-172-6/+7
| | | * | | Merge 5.2 -> 5.3unknown2012-11-012-35/+37
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 5.1 -> 5.2unknown2012-11-012-35/+37
| | | | |\ \ | | | | | |/
| | | | | * Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_d...Michael Widenius2012-10-311-3/+4
| | | | | * Fixed MDEV-647,LP:986261 - Aria unit tests fail at ma_test2Michael Widenius2012-10-311-32/+33
| * | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-6/+0
| |\ \ \ \ \
| | * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-6/+0
* | | | | | | set username=hostname=NULL in the P_S for the aria background checkpoint threadSergei Golubchik2012-11-051-0/+4
* | | | | | | merge with 5.5Sergei Golubchik2012-11-032-1/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_U...Vladislav Vaintroub2012-10-301-1/+5
| * | | | | | 5.3 mergeSergei Golubchik2012-10-181-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | mergeSergei Golubchik2012-09-272-1/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge from 5.1.unknown2012-09-263-4/+5
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix some failures in 5.1 Buildbot:unknown2012-09-262-3/+4
* | | | | | workaround for gcc 4.3.2 bug on lenny-x86 at -O3Sergei Golubchik2012-10-291-0/+3
* | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-1910-14/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | makes mi_test_all.sh & ma_test_all.sh working (MDEV-285)unknown2012-09-252-3/+12
| | |_|_|/ | |/| | |
| * | | | Fixed compiler errorsMichael Widenius2012-08-146-2/+16
| * | | | Fixed compiler warnings (A few of these was bugs)Michael Widenius2012-08-132-0/+4
| * | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmakeSergei Golubchik2012-07-311-3/+0
| * | | | Merge 5.3->5.5Sergey Petrunya2012-07-182-6/+23
| |\ \ \ \ | | |/ / /