summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
| | |\ \ \
| | | * | | fix InnoDB on WindowsSergei Golubchik2016-02-171-0/+7
| | | * | | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-1627-2557/+2678
| | | |\ \ \
| | | | * | | - Fix to MDEV-9542 Connect was not handling NULLs in the answerOlivier Bertrand2016-02-1510-2490/+2520
| | | | * | | - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-258-17/+82
| | | | * | | - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB SchemaOlivier Bertrand2016-01-098-42/+61
| | | | * | | - Fix MDEV-9322.Olivier Bertrand2015-12-271-2/+2
| | | | * | | - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp.Olivier Bertrand2015-12-142-6/+13
| | | * | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
| | | |\ \ \ \
| | | | * | | | 5.6.29Sergei Golubchik2016-02-161-2/+3
| | | * | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-02-1616-119/+443
| | | |\ \ \ \ \
| | | | * | | | | 5.6.28-76.1Sergei Golubchik2016-02-1616-119/+447
| | | * | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-1618-158/+503
| | | |\ \ \ \ \ \
| | | | * | | | | | 5.6.29Sergei Golubchik2016-02-1617-155/+437
| | | * | | | | | | Revert "MDEV-8696: Adding indexes on empty table is slow with large innodb_so...Sergei Golubchik2016-02-1612-190/+42
| | | * | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | compilation errors on sparc sun studio 10Sergei Golubchik2016-02-151-0/+2
| | | | * | | | | | | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-02-093-4/+18
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | 5.5.47-37.7Sergei Golubchik2016-02-093-3/+17
| | | | * | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-092-24/+18
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | BUG#22530768 Innodb freeze running REPLACE statementsmysql-5.5.48Shaohua Wang2016-01-152-17/+21
| | | | | * | | | | | | | Bug #22214852: MYSQL 5.5 AND 5.6: MAIN.KEY AND OTHERSreeharsha Ramanavarapu2015-11-181-2/+2
| | | | * | | | | | | | | Fix function visibility as it is used on row0mysql.c in Windows.Jan Lindström2016-02-034-2/+30
| | | | * | | | | | | | | MDEV-9471: Server crashes or returns an error while trying to alter partition...Jan Lindström2016-02-032-0/+98
| | * | | | | | | | | | | MDEV-9424: Server crashes when slave works with partitioned tables copied fro...Jan Lindström2016-02-151-9/+63
| | * | | | | | | | | | | MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key ...Jan Lindström2016-02-156-34/+146
| | |/ / / / / / / / / /
| | * | | | | | | | | | MDEV-9351 Fix CPU detection for TokuDB on FreeBSDSergei Golubchik2016-02-151-7/+4