mariadb/storage/xtradb
Sergei Golubchik d019af402c misc after-merge changes:
* remove new InnoDB-specific ER_ and HA_ERR_ codes
* renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific
* remove duplicate enum definitions (durability_properties, icp_result)
* move new mysql-test include files to their owner suite
* rename xtradb.rdiff files to *-disabled
* remove mistakenly committed helper perl module
* remove long obsolete handler::ha_statistic_increment() method
* restore the standard C xid_t structure to not have setters and getters
* remove xid_t::reset that was cleaning too much
* move MySQL-5.7 ER_ codes where they belong
* fir innodb to include service_wsrep.h not internal wsrep headers
* update tests and results
2016-09-10 16:04:44 +02:00
..
api Merge branch 'merge-xtradb-5.6' into 10.0 2015-10-09 18:16:27 +02:00
btr Fixed compiler warnings and test failures found by buildbot 2016-06-24 02:25:14 +03:00
buf Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
data move to storage/xtradb 2015-05-04 19:15:28 +02:00
dict Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
dyn move to storage/xtradb 2015-05-04 19:15:28 +02:00
eval move to storage/xtradb 2015-05-04 19:15:28 +02:00
fil Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
fsp Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
fts Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
fut move to storage/xtradb 2015-05-04 19:15:28 +02:00
ha 5.6.30-76.3 2016-06-21 14:20:09 +02:00
handler misc after-merge changes: 2016-09-10 16:04:44 +02:00
ibuf Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
include misc after-merge changes: 2016-09-10 16:04:44 +02:00
lock Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
log Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
mach move to storage/xtradb 2015-05-04 19:15:28 +02:00
mem 5.6.30-76.3 2016-06-21 14:20:09 +02:00
mtr Merge tag 'mariadb-10.0.20' into 10.1 2015-06-27 20:35:26 +02:00
mysql-test/storage_engine Follow-up for MDEV-6720 (enable connection log in mysqltest by default) 2016-06-19 20:30:03 +03:00
os Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
page MDEV-9040: 10.1.8 fails after upgrade from 10.0.21 2015-11-05 10:30:48 +02:00
pars MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a table 2015-08-14 16:25:18 +03:00
que 5.6.24-72.2 2015-06-16 11:04:40 +02:00
read move to storage/xtradb 2015-05-04 19:15:28 +02:00
rem Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
row Merge InnoDB 5.7 from mysql-5.7.9. 2016-09-02 13:22:28 +03:00
srv Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sync Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
trx Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
usr move to storage/xtradb 2015-05-04 19:15:28 +02:00
ut MDEV-8684: Remove delaying maths in ut_delay 2016-03-31 16:35:19 +11:00
CMakeLists.txt misc after-merge changes: 2016-09-10 16:04:44 +02:00
COPYING.Google move to storage/xtradb 2015-05-04 19:15:28 +02:00
COPYING.Percona move to storage/xtradb 2015-05-04 19:15:28 +02:00
Doxyfile move to storage/xtradb 2015-05-04 19:15:28 +02:00
ha_innodb.def move to storage/xtradb 2015-05-04 19:15:28 +02:00