summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.5.33a mergeSergei Golubchik2013-09-2013-47/+48
|\
| * 5.5.33aSergei Golubchik2013-09-191-1/+1
| * MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb equivalentSergei Golubchik2013-09-192-39/+5
| * MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs...Sergei Golubchik2013-09-192-2/+4
| * MDEV-5021 tokudb ft-index libraries are build with -DWITHOUT_TOKUDB=1Sergei Golubchik2013-09-191-1/+2
| * MDEV-5026 cannot use system jemallocSergei Golubchik2013-09-191-3/+12
| * MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-187-2/+25
* | fix debian builds. don't use WITH_MAX anymoreSergei Golubchik2013-09-191-1/+0
* | mergeSergei Golubchik2013-09-183622-85813/+1904839
|\ \
| * \ 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-183622-85813/+1904839
| |\ \ | | |/
| | * fix upgrades when mariadb-galera-server-5.5 is installedSergei Golubchik2013-09-182-4/+4
| | * MDEV-5029 Crash in MariaDB 5.5.33 with .frm from older MariaDB releaseSergei Golubchik2013-09-184-5/+21
| | * merge with 5.5-releaseSergei Golubchik2013-09-172-6/+6
| | |\
| | | * mariadb-tokudb-engine deb package is not architecture-independentSergei Golubchik2013-09-172-2/+2
| | | * specify deb conflicts correctlySergei Golubchik2013-09-162-4/+4
| | * | Fixed tokudb with ccache build failure.Sergey Vojtovich2013-09-171-1/+1
| | * | Fixed jemalloc with ccache build failure.Sergey Vojtovich2013-09-171-1/+1
| | * | Merge from 5.3Alexander Barkov2013-09-161-1/+1
| | |\ \
| | | * | backport from 10.0Alexander Barkov2013-09-161-1/+1
| | * | | Merge from 5.3Alexander Barkov2013-09-162-0/+41
| | |\ \ \ | | | |/ /
| | | * | MDEV-4861 TIME/DATETIME arithmetics does not preserve INTERVAL precisionAlexander Barkov2013-09-162-0/+41
| | * | | Merge from 5.3Alexander Barkov2013-09-162-0/+74
| | |\ \ \ | | | |/ /
| | | * | MDEV-4870 Wrong values of CASE, COALESCE, IFNULL on a combination of differen...Alexander Barkov2013-09-162-0/+74
| | * | | Merge from 5.3Alexander Barkov2013-09-162-0/+12
| | |\ \ \ | | | |/ /
| | | * | MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)Alexander Barkov2013-09-162-0/+12
| | * | | Merge from 5.3Alexander Barkov2013-09-163-1/+102
| | |\ \ \ | | | |/ /
| | | * | MDEV-4843 Wrong data type for TIMESTAMP('2001-01-01','10:10:10')Alexander Barkov2013-09-163-1/+102
| | * | | Merge 5.3->5.5Igor Babaev2013-09-153-1/+35
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Fixed bug mdev-5015.Igor Babaev2013-09-153-1/+35
| | * | fix BUILD/compile-solaris-amd64 to produce working binariesSergei Golubchik2013-09-131-5/+5
| | * | MDEV-5012 Server crashes in Item_ref::real_item on EXPLAIN with select subque...Sergei Golubchik2013-09-133-1/+27
| | * | Null-merge from 5.3.Alexander Barkov2013-09-130-0/+0
| | |\ \ | | | |/
| | | * MDEV-4724 Some temporal functions do not preserve microsecondsAlexander Barkov2013-09-1318-135/+436
| | * | merge 5.3->5.5unknown2013-09-133-5/+57
| | |\ \ | | | |/
| | | * MDEV-5005: Subquery in Procedure somehow affecting temporary tableunknown2013-09-123-3/+55
| | * | Merge from 5.3.Alexander Barkov2013-09-1323-185/+490
| | |\ \
| | | * | MDEV-4724 Some temporal functions do not preserve microsecondsAlexander Barkov2013-09-1218-135/+436
| | * | | Merge 5.3 -> 5.5Sergey Petrunya2013-09-126-0/+73
| | |\ \ \ | | | | |/ | | | |/|
| | | * | MDEV-5011: ERROR Plugin 'MEMORY' has ref_count=1 after shutdown for SJM queriesSergey Petrunya2013-09-126-0/+73
| | | |/
| | * | tokudb buildbot fixesSergei Golubchik2013-09-123-33/+9
| | * | support ./mtr suite.test,com,bi,na,tions syntaxSergei Golubchik2013-09-111-10/+27
| | * | merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-102923-81932/+1896892
| | |\ \
| | | * | introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-106-9/+28
| | | * | INSTALL_DOCUMENTATION function for CMakeLists.txtSergei Golubchik2013-09-106-19/+52
| | | * | * mariadb-tokudb-engine-5.5.debSergei Golubchik2013-09-1011-10/+84
| | | * | MariaDB-tokudb-engine.rpmSergei Golubchik2013-09-095-4/+17
| | | * | fixes for buildbotSergei Golubchik2013-09-096-14/+31
| | | * | remove symlinks from the treeSergei Golubchik2013-09-091-1/+0
| | | * | fixes for out-of-source buildsSergei Golubchik2013-09-093-12/+12
| | | * | tokudb patches for prepare range scanSergei Golubchik2013-09-094-1/+49
View Lorry Controller Status