| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -2/+2 |
| |\ | |||||
| | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -2/+2 |
| | | | |||||
| | * | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+548 |
| | | |||||
| * | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least ↵ | Jan Lindström | 2015-09-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | one encrypted table exists and encryption service is not available Analysis: Problem was that in fil_read_first_page we do find that table has encryption information and that encryption service or used key_id is not available. But, then we just printed fatal error message that causes above assertion. Fix: When we open single table tablespace if it has encryption information (crypt_data) store this crypt data to the table structure. When we open a table and we find out that tablespace is not available, check has table a encryption information and from there is encryption service or used key_id is not available. If it is, add additional warning for SQL-layer. | ||||
| * | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -0/+7 |
| | | | | | XtraDB 5.6.16-64.2 | ||||
| * | Percona-Server-5.6.15-rel63.0.tar.gz merge | Sergei Golubchik | 2014-02-26 | 1 | -20/+24 |
| | | |||||
| * | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -15/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support ha_innodb.so as a dynamic plugin. * remove obsolete *,innodb_plugin.rdiff files * s/--plugin-load=/--plugin-load-add=/ * MYSQL_PLUGIN_IMPORT glob_hostname[] * use my_error instead of push_warning_printf(ER_DEFAULT) * don't use tdc_size and tc_size in a module update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10) * copy new tests over * disable some tests for (old) InnoDB * delete XtraDB tests that no longer apply small compatibility changes: * s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/ * revert unnecessary InnoDB changes to make it a bit closer to the upstream fix XtraDB to compile on Windows (both as a static and a dynamic plugin) disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5) storage/innobase/handler/ha_innodb.cc: revert few unnecessary changes to make it a bit closer to the original InnoDB storage/innobase/include/univ.i: correct the version to match what it was merged from | ||||
| * | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
| | | |||||
| * | merged with XtraDB 1.1.8-26.0 | Sergei Golubchik | 2012-06-15 | 1 | -0/+10 |
| | | |||||
| * | Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5. | unknown | 2012-02-15 | 1 | -8/+0 |
| | | |||||
| * | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5 | unknown | 2011-12-15 | 1 | -17/+4 |
| | | |||||
| * | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 1 | -28/+12 |
| | | | | | fix test cases | ||||
| * | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 1 | -19/+33 |
| | | |||||
| * | Merge XtraDB 8 into MariaDB. | unknown | 2009-11-13 | 1 | -173/+165 |
| | | |||||
| * | Import Percona XtraDB into the MariaDB source tree. | unknown | 2009-06-09 | 1 | -0/+545 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |