summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler/ha_innodb.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-8250: InnoDB: Page compressed tables are not compressed and compressed+e...Jan Lindström2015-06-041-0/+1
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-3/+10
|\
| * XtraDB-5.6.23-72.1Sergei Golubchik2015-05-051-3/+10
| |\
| | * 5.6.23-72.1Sergei Golubchik2015-05-041-3/+10
| | * move to storage/xtradbSergei Golubchik2015-05-041-0/+18586
* | restore innodb_encrypt_tables validation functionSergei Golubchik2015-05-281-1/+1
* | MDEV-8213: encryption.encryption_force, encryption.encrypt_and_grep fail with...Jan Lindström2015-05-261-1/+1
* | MDEV-8164: Server crashes in pfs_mutex_enter_func after fil_crypt_is_closing ...Jan Lindström2015-05-181-5/+25
* | InnoDB: simplify innobase_compression_algorithm_validate()Sergei Golubchik2015-05-151-25/+3
* | MDEV-8158 InnoDB: Failing assertion: new_state->key_version != ENCRYPTION_KEY...Sergei Golubchik2015-05-151-2/+54
* | Identical key derivation code in XtraDB/InnoDB/AriaSergei Golubchik2015-05-151-2/+1
* | MDEV-8143: InnoDB: Database page corruption on disk or a failed file readJan Lindström2015-05-141-2/+24
* | MDEV-8015 InnoDB: Failing assertion: new_state->key_version != ENCRYPTION_KEY...Sergei Golubchik2015-05-131-0/+7
* | Merge 10.0 -> 10.1Kristian Nielsen2015-04-201-1/+6
|\ \ | |/
| * MDEV-7908: assertion in innobase_release_savepointJan Lindström2015-04-061-1/+4
| * MDEV-7367: Updating a virtual column corrupts table which crashes serverJan Lindström2015-03-311-0/+2
* | add support for --innodb-encrypt-tables=FORCESergei Golubchik2015-04-101-5/+19
* | allow srv_encrypt_tables and ENCRYPTED=YES to be used togetherSergei Golubchik2015-04-101-20/+9
* | rename table attribute ENCRYPTION=ON/OFF to ENCRYPTED=YES/NOSergei Golubchik2015-04-101-1/+1
* | s/innodb_default_encryption_key/innodb_default_encryption_key_id/Sergei Golubchik2015-04-101-6/+4
* | change ENCRYPTION_KEY_ID to be HA_TOPTION_SYSVARSergei Golubchik2015-04-101-15/+11
* | Store the key id in the tablespace and read it backSergei Golubchik2015-04-091-2/+1
* | Add encryption key id to the API as a distinct conceptSergei Golubchik2015-04-091-2/+2
* | Merge branch 'bb-10.1-jan-encryption' into bb-10.1-sergSergei Golubchik2015-04-091-47/+50
|\ \
| * | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-071-33/+33
| * | InnoDB/XtraDB Encryption code cleanupJan Lindström2015-04-071-6/+4
| * | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-071-29/+39
| * | InnoDB/XtraDB Encryption cleanup.Jan Lindström2015-04-071-8/+3
* | | update XtraDB/InnoDB plugin maturity to match the serverSergei Golubchik2015-04-091-1/+1
* | | clarify/simplify new innodb sysvars: help textsSergei Golubchik2015-04-091-4/+6
* | | clarify/simplify new innodb sysvars: innodb-scrub-force-testingSergei Golubchik2015-04-091-2/+2
* | | clarify/simplify new innodb sysvars: innodb-scrub-log-intervalSergei Golubchik2015-04-091-14/+6
* | | renames to follow single consistent naming styleSergei Golubchik2015-04-091-1/+1
|/ /
* | InnoDB cleanup. Remove empty statements i.e. extra ; characters.Jan Lindström2015-03-161-1/+1
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-7/+16
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-03-061-6/+12
| |\
| | * after innodb/xtradb merge: use the correct visibility for internal functionsSergei Golubchik2015-03-061-1/+1
| | * MDEV-7578 :Slave is ~10x slower to execute set of statements compared to mast...Jan Lindström2015-03-051-6/+11
| * | Merge remote-tracking branch 'origin/10.0' into 10.0Sergei Golubchik2015-02-221-1/+0
| |\ \
| | * | xtradb 5.6.22-72.0Sergei Golubchik2015-02-181-1/+0
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-0/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-121-1/+55
| | |\
| | | * XtraDB 5.5.41-37.0Sergei Golubchik2015-02-111-1/+63
| | |/
* | | MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITSJan Lindström2015-02-211-1/+9
* | | Merged from 10.0-FusionIO:Jan Lindström2015-02-191-1/+23
* | | MDEV-7593: Default encryption key does not work correctly for pageJan Lindström2015-02-181-8/+16
* | | Fix test failure seen on p8-rhel7Jan Lindström2015-02-111-5/+5
* | | Do not yet allow encrypted tables with compressed tables.Jan Lindström2015-02-101-0/+8
* | | encryption key management plugin apiSergei Golubchik2015-02-101-1/+1
* | | Fixed XtraDB implementation of encryption and page encryption.Jan Lindström2015-02-101-0/+8