database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source 
This should also fix the MariaDB 10.2.2 bug
MDEV-13826 CREATE FULLTEXT INDEX on encrypted table fails.

MDEV-12634 FIXME: Modify innodb-index-online, innodb-table-online
so that they will write and read merge sort files. InnoDB 5.7
introduced some optimizations to avoid using the files for small tables.

Many collation test results have been adjusted for MDEV-10191.
This commit is contained in:
Marko Mäkelä
2017-09-16 22:31:53 +03:00
parent c2815c7c2c 836d4e74d9
commit d9277732d7
67 changed files with 2122 additions and 1358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/suite/innodb/r/innodb-index-online,crypt.rdiff Normal file
View File

@ -0,0 +1,20 @@
--- innodb-index-online.result
+++ innodb-index-online,crypt.reject
@@ -301,7 +301,7 @@
@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0,
@rowlog_encrypt_1>@rowlog_encrypt_0;
sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0
-0 0 0 0
+0 0 0 1
SET DEBUG_SYNC = 'now SIGNAL dml2_done';
connection con1;
ERROR HY000: Creating index 'c2e' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again
@@ -423,7 +423,7 @@
@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted,
@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted;
sort_encrypted sort_decrypted log_encrypted log_decrypted
-0 0 0 0
+0 0 1 1
connection con1;
SELECT COUNT(c22f) FROM t1;
COUNT(c22f)