From 83b755361cd58f420226ce0e098d338491c44bed Mon Sep 17 00:00:00 2001
From: marko <>
Date: Mon, 8 Feb 2010 08:06:39 +0000
Subject: [PATCH] branches/zip: row_merge_drop_index(): Remove redundant
 condition on SYS_INDEXES.TABLE_ID.  INDEX_ID must be instance-widely unique,
 because SYS_FIELDS is not indexed by TABLE_ID.

---
 row/row0merge.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/row/row0merge.c b/row/row0merge.c
index a9bcb7df55c..7be9bd412a3 100644
--- a/row/row0merge.c
+++ b/row/row0merge.c
@@ -1977,14 +1977,12 @@ row_merge_drop_index(
 		/* Drop the field definitions of the index. */
 		"DELETE FROM SYS_FIELDS WHERE INDEX_ID = :indexid;\n"
 		/* Drop the index definition and the B-tree. */
-		"DELETE FROM SYS_INDEXES WHERE ID = :indexid\n"
-		"		AND TABLE_ID = :tableid;\n"
+		"DELETE FROM SYS_INDEXES WHERE ID = :indexid;\n"
 		"END;\n";
 
 	ut_ad(index && table && trx);
 
 	pars_info_add_dulint_literal(info, "indexid", index->id);
-	pars_info_add_dulint_literal(info, "tableid", table->id);
 
 	trx_start_if_not_started(trx);
 	trx->op_info = "dropping index";
-- 
2.30.9