--- innodb-table-online.result +++ innodb-table-online,crypt.reject @@ -291,7 +291,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'; # session con1 connection con1; @@ -393,7 +393,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 +1 1 1 1 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5)); ERROR 23000: Duplicate entry '' for key 'PRIMARY' UPDATE t1 SET c3 = NULL WHERE c3 = '';