summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2016-03-2363-361/+708
|\
| * Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-03-2244-213/+284
| |\
| | * Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-03-219-64/+110
| | |\
| | | * - Fix compile error when copying a string on itself.Olivier Bertrand2016-03-192-16/+15
| | | * - Fix crash when sorting a TBL table with thread=yes.Olivier Bertrand2016-03-173-4/+4
| | | * - Fix MDEV-9603 compiler error.Olivier Bertrand2016-03-167-41/+94
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-2131-84/+88
| | |\ \
| | | * | MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"Sergei Golubchik2016-03-219-50/+50
| | | * | ASAN error in OQGraph engineSergei Golubchik2016-03-211-0/+4
| | | * | ASAN error in CONNECT engineSergei Golubchik2016-03-211-2/+8
| | | * | update tests and resultsSergei Golubchik2016-03-212-0/+6
| | | * | Use /bin/shBernard Spil2016-03-211-2/+2
| | | * | MDEV-9667: Server hangs after select count(distinct name) from t2 where a=836...Jan Lindström2016-03-112-15/+9
| | | * | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-0440-59/+59
| | | * | MDEV-7907 tokudb.cluster_filter_unpack_varchar_hidden fails sporadically in b...Elena Stepanova2016-02-262-4/+4
| | * | | MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Dia...Sergei Golubchik2016-03-192-0/+21
| | * | | update plugins' maturity levelsSergei Golubchik2016-03-187-73/+73
| * | | | MDEV-9678: Data Directory bugJan Lindström2016-03-226-35/+69
| |/ / /
| * | | MDEV-9422: Checksum errors on restart when killing busy instance that uses en...Jan Lindström2016-03-182-11/+29
| * | | MDEV-9640: Add used key_id to INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTIONJan Lindström2016-03-187-15/+40
| * | | MDEV-9422: Checksum errors on restart when killing busy instance that uses en...Jan Lindström2016-03-189-40/+145
| * | | Merge pull request #160 from grooverdan/crc32_power_abi_fixJan Lindström2016-03-152-20/+82
| |\ \ \
| | * | | MDEV-9699: power crc32: Per the PPC64 ABI, v20-v31 are non-volatile registersAnton Blanchard2016-03-082-20/+82
| * | | | Add check to avoid NULL-pointer access if encryption informationJan Lindström2016-03-132-6/+6
| * | | | MDEV-9549: Trying to decrypt a not encrypted pageJan Lindström2016-03-122-16/+48
| |/ / /
* | | | Removed TABLE->sort to make it possible to have multiple active calls toMonty2016-03-221-1/+2
* | | | Fixed compiler failures and warningsMonty2016-03-202-19/+9
* | | | MDEV-9058: protocol: COM_MULTI command (part 1)Oleksandr Byelkin2016-03-181-1/+3
* | | | Yet more fixes covering thread_id type changeSergey Vojtovich2016-02-271-1/+1
* | | | MDEV-9488 - Table cache cleanupsSergey Vojtovich2016-02-261-4/+1
* | | | after merge fix debian buildsSergei Golubchik2016-02-261-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-2597-3308/+4630
|\ \ \ \ | |/ / /
| * | | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-242-6/+6
| * | | Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-02-2469-3123/+4105
| |\ \ \
| | * \ \ Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-244-2/+59
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-2387-3113/+4027
| | | |\ \ \
| | | * | | | Merge sync point from previous commit to XtraDB.Nirbhay Choubey2016-02-231-0/+9
| | | * | | | refs codership/mysql-wsrep#233sjaakola2016-02-231-0/+9
| | | * | | | refs codership/mysql-wsrep#184Nirbhay Choubey2016-02-221-2/+3
| | | * | | | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-2/+3
| | | * | | | refs codership/mysql-wsrep#184Nirbhay Choubey2016-02-221-1/+2
| | | * | | | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-1/+2
| | * | | | | Merge tracking branch 'connect/10.1' into 10.1Sergei Golubchik2016-02-231-10/+12
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | - Fix to MDEV-9579 be testing for void result.Olivier Bertrand2016-02-201-10/+12
| | | * | | | - Fix to MDEV-9542 Connect was not handling NULLs in the answerOlivier Bertrand2016-02-159-2489/+2519
| | | * | | | - Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed)Olivier Bertrand2016-01-257-15/+80
| | | * | | | - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-181-2/+2
| | * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-2366-3111/+4034
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | connect engine compiler warningsSergei Golubchik2016-02-182-4/+4
| | | | |_|/ | | | |/| |
| | | * | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-1772-3014/+3666
| | | |\ \ \