branches/zip: row_merge_lock_table(): Clear the trx->dict_operation flag

for the duration of the lock_table() call in order to avoid a bogus warning.

row/row0merge.c

@@ -1674,8 +1674,16 @@ row_merge_lock_table(
 	thr->run_node = thr;
 	thr->prev_node = thr->common.parent;
 
+	/* Temporarily clear the dict_operation flag in order to
+	avoid a bogus warning in lock_table_enqueue_waiting(). */
+	ut_ad(trx->dict_operation == 1);
+	trx->dict_operation = 0;
+
 	err = lock_table(0, table, LOCK_X, thr);
 
+	/* Restore the dict_operation flag. */
+	trx->dict_operation = 1;
+
 	trx->error_state = err;
 
 	if (UNIV_LIKELY(err == DB_SUCCESS)) {