mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase
History
Sergei Golubchik 5dffda3ccc Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 
With changes:

* update tests to pass (new encryption/encryption_key_id syntax).
* not merged the code that makes engine aware of the encryption mode
  (CRYPT_SCHEME_1_CBC, CRYPT_SCHEME_1_CTR, storing it on disk, etc),
  because now the encryption plugin is handling it.
* compression+encryption did not work in either branch before the
  merge - and it does not work after the merge. it might be more
  broken after the merge though - some of that code was not merged.
* page checksumming code was not moved (moving of page checksumming
  from fil_space_encrypt() to fil_space_decrypt was not merged).
* restored deleted lines in buf_page_get_frame(), otherwise
  innodb_scrub test failed.
2015-04-09 19:27:40 +02:00
..
api InnoDB 5.6.21 2014-11-20 16:59:22 +01:00
btr Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
buf Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
data Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
dict Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
dyn MDEV-5574 Set AUTO_INCREMENT below max value of column. 2014-02-01 09:33:26 +01:00
eval Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
fil Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
fsp InnoDB/XtraDB Encryption cleanup. 2015-04-07 23:44:56 +02:00
fts innodb 5.6.23 2015-02-18 17:59:21 +01:00
fut Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
ha mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
handler Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
ibuf Merge remote-tracking branch 'origin/10.0' into 10.0 2015-02-22 21:45:24 +01:00
include Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
lock Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
log Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
mach Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
mem MDEV-6184 10.0.11 merge 2014-05-06 09:57:39 +02:00
mtr Push for testing of encryption 2015-02-10 10:21:17 +01:00
mysql-test/storage_engine Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
os InnoDB/XtraDB Encryption cleanup 2015-04-07 23:44:56 +02:00
page Push for testing of encryption 2015-02-10 10:21:17 +01:00
pars MDEV-6929: Port Facebook Prefix Index Queries Optimization 2014-11-03 11:18:52 +02:00
que Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
read MDEV-5574 Set AUTO_INCREMENT below max value of column. 2014-02-01 09:33:26 +01:00
rem Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
row InnoDB/XtraDB Encryption cleanup. 2015-04-07 23:44:56 +02:00
srv InnoDB/XtraDB Encryption code cleanup 2015-04-07 23:44:57 +02:00
sync MDEV-7619: Improve long semaphore wait output 2015-03-11 07:31:57 +02:00
trx Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
usr Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERS 2013-06-10 22:29:41 +02:00
ut Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
CMakeLists.txt encryption cleanup: small changes 2015-04-05 13:14:37 +02:00
compile-innodb null-merge from innodb-5.6 mergetree (as of 5.6.14) 2014-02-26 19:22:48 +01:00
COPYING.Google Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Percona Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Doxyfile Remove ut0auxconf.h. 2010-09-09 14:27:52 +03:00
ha_innodb.def Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
plugin_exports Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs 2014-05-01 14:05:52 +02:00