summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2Monty2016-04-287-31/+92
|\
| * MDEV-9977: Crash when accessing large (>4G) InnoDB table onJan Lindström2016-04-281-4/+2
| * MDEV-9121: innodb_force_recovery = 6 cannot recover ANY DATA whenJan Lindström2016-04-271-5/+15
| * Use _ReadWriteBarrier() rather than MemoryBarrier() for preventing compile op...Vladislav Vaintroub2016-04-061-1/+1
| * Fix compile error in UT_COMPILER_BARRIER on Visual Studio compiler.Vladislav Vaintroub2016-04-061-1/+7
| * Merge pull request #168 from grooverdan/10.1-MDEV-8684-UT_RELAX_CPU_isnt_rela...Jan Lindström2016-04-062-16/+20
| |\
| | * MDEV-8684: Use POWER wrappers rather than direct asmDaniel Black2016-04-011-2/+3
| | * MDEV-8684: UT_RELAX_CPU on Power to non-empty expansionDaniel Black2016-03-311-0/+5
| | * MDEV-8684: Remove delaying maths in ut_delaySergey Vojtovich2016-03-312-9/+7
| | * Some POWER specific optimizationsYasufumi Kinoshita2016-03-312-0/+12
| | * Bug#20045167 UT_DELAY MISSING COMPILER BARRIERMarko Mäkelä2016-03-312-13/+1
| * | MDEV-9840: Test encryption.innodb-log-encrypt-crash fails on buildbotJan Lindström2016-03-311-4/+11
| * | MDEV-9793: getting mysqld crypto key from key version failedJan Lindström2016-03-303-3/+39
| |/
* | Fixed compiler warningsMichael Widenius2016-04-071-4/+4
* | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-311-5/+5
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-2316-109/+256
|\ \ | |/
| * Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-03-226-39/+39
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2016-03-214-6/+6
| | |\
| | | * MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"Sergei Golubchik2016-03-212-3/+3
| | | * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-042-3/+3
| | * | update plugins' maturity levelsSergei Golubchik2016-03-182-33/+33
| * | | MDEV-9678: Data Directory bugJan Lindström2016-03-224-26/+53
| |/ /
| * | 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-183-2/+15
| * | MDEV-9422: Checksum errors on restart when killing busy instance that uses en...Jan Lindström2016-03-184-12/+54
| * | Merge pull request #160 from grooverdan/crc32_power_abi_fixJan Lindström2016-03-151-10/+41
| |\ \
| | * | MDEV-9699: power crc32: Per the PPC64 ABI, v20-v31 are non-volatile registersAnton Blanchard2016-03-081-10/+41
| * | | Add check to avoid NULL-pointer access if encryption informationJan Lindström2016-03-131-3/+3
| * | | MDEV-9549: Trying to decrypt a not encrypted pageJan Lindström2016-03-121-8/+24
| |/ /
* | | Fixed compiler failures and warningsMonty2016-03-201-10/+0
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-2530-361/+848
|\ \ \ | |/ /
| * | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
| * | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-242-1/+47
| |\ \
| | * \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-2323-264/+660
| | |\ \ | | | |/
| | * | refs codership/mysql-wsrep#233sjaakola2016-02-231-0/+9
| | * | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-2/+3
| | * | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-1/+2
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-2322-312/+710
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-1721-241/+518
| | |\ \
| | | * | fix InnoDB on WindowsSergei Golubchik2016-02-171-0/+7
| | | * | 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-166-96/+21
| | * | | | MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key ...Jan Lindström2016-02-153-17/+73
| | |/ / /
| | * | | XtraDB/InnoDB crash with autoinc, vcol and online alterSergei Golubchik2016-02-151-2/+4
| | * | | Use C++ linkage.Jan Lindström2016-02-042-2/+0
| | * | | Fix function visibility as it is used on row0mysql.c in Windows.Jan Lindström2016-02-032-2/+16
| | * | | MDEV-9471: Server crashes or returns an error while trying to alter partition...Jan Lindström2016-02-031-0/+50
| | * | | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-291-1/+1
| * | | | MDEV-9559: Server without encryption configs crashes if selecting from an imp...Jan Lindström2016-02-177-45/+88