Marko Mäkelä 446b3ebdfc Merge 10.2 into 10.3 ...

FIXME: Properly resolve conflicts between MDEV-18883
and MDEV-7742/MDEV-8305, and record the correct result for
main.log_slow

2019-03-05 12:56:05 +02:00

..

aria_tiny.result

…

create_or_replace.result

…

debug_key_management.result

…

encrypt_and_grep.result

…

encryption_force.result

…

filekeys_emptyfile.result

…

filekeys_encfile_bad.result

…

filekeys_encfile_badfile.result

…

filekeys_encfile_file.result

…

filekeys_encfile_no.result

…

filekeys_encfile.result

…

filekeys_nofile.result

…

filekeys_syntax.result

…

filekeys_tooshort.result

…

filekeys_unencfile.result

…

innochecksum.result

…

innodb_encrypt_log_corruption.result

MDEV-13564 Mariabackup does not work with TRUNCATE

2018-09-07 22:15:06 +03:00

innodb_encrypt_log.result

…

innodb_encryption_discard_import.result

MDEV-12645 - mysql_install_db: no install test db option

2018-04-30 19:34:08 +04:00

innodb_encryption_filekeys.result

…

innodb_encryption_is.result

…

innodb_encryption_row_compressed.result

…

innodb_encryption_tables.result

…

innodb_encryption-page-compression.result

…

innodb_encryption.result

…

innodb_first_page.result

…

innodb_lotoftables.result

…

innodb_onlinealter_encryption.result

…

innodb_page_encryption_key_change.result

…

innodb_scrub_background.result

…

innodb_scrub.result

…

innodb-bad-key-change2.result

MDEV-13103: Improve 'cannot be decrypted' error message

2018-06-13 16:02:40 +03:00

innodb-bad-key-change3.result

MDEV-12645 - mysql_install_db: no install test db option

2018-04-30 19:34:08 +04:00

innodb-bad-key-change4.result

MDEV-13103: Improve 'cannot be decrypted' error message

2018-06-13 16:02:40 +03:00

innodb-bad-key-change.result

Merge branch '10.2' into 10.3

2019-01-03 13:09:41 +01:00

innodb-checksum-algorithm,32k.rdiff

MDEV-18601 Can't create table with ENCRYPTED=DEFAULT when innodb_default_encryption_key_id!=1

2019-02-28 23:20:31 +02:00

innodb-checksum-algorithm,64k.rdiff

MDEV-18601 Can't create table with ENCRYPTED=DEFAULT when innodb_default_encryption_key_id!=1

2019-02-28 23:20:31 +02:00

innodb-checksum-algorithm.result

Merge 10.2 into 10.3

2019-03-05 12:56:05 +02:00

innodb-compressed-blob.result

Merge 10.1 into 10.2

2019-03-04 16:46:58 +02:00

innodb-discard-import-change.result

MDEV-12645 - mysql_install_db: no install test db option

2018-04-30 19:34:08 +04:00

innodb-discard-import.result

MDEV-16416 Crash on IMPORT TABLESPACE of a ROW_FORMAT=COMPRESSED table

2018-06-07 10:34:32 +03:00

innodb-encr-threads.result

…

innodb-encryption-alter.result

Merge 10.1 into 10.2

2019-03-04 16:46:58 +02:00

innodb-encryption-disable.result

Merge branch '10.2' into 10.3

2019-01-03 13:09:41 +01:00

innodb-first-page-read.result

…

innodb-force-corrupt.result

Merge 10.2 into 10.3

2018-12-18 09:15:41 +02:00

innodb-key-rotation-disable.result

…

innodb-missing-key.result

Merge branch '10.2' into 10.3

2019-01-03 13:09:41 +01:00

innodb-page_encryption_compression.result

…

innodb-page_encryption_log_encryption.result

…

innodb-page_encryption-32k.result

…

innodb-page_encryption.result

…

innodb-read-only.result

…

innodb-redo-badkey.result

MDEV-13103: Improve 'cannot be decrypted' error message

2018-06-13 16:02:40 +03:00

innodb-redo-nokeys.result

Merge branch '10.1' into 10.2

2018-06-21 23:47:39 +02:00

innodb-remove-encryption.result

Merge remote-tracking branch '10.2' into 10.3

2018-04-12 12:41:19 +03:00

innodb-scrub-log.result

…

innodb-spatial-index.result

dirty merge

2019-02-07 13:59:31 +01:00

second_plugin-12863.result

…

tempfiles.result

…