From 92f615ae30fd5b87050ccf39ad7eabb4709c5382 Mon Sep 17 00:00:00 2001
From: marko <Unknown>
Date: Wed, 8 Aug 2007 08:49:33 +0000
Subject: [PATCH] branches/zip: merge_index_field_struct: Remove the unused
 field col_type.

---
 handler/ha_innodb.cc | 3 ---
 include/row0merge.h  | 1 -
 2 files changed, 4 deletions(-)

diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index 7680eebba44..df6221bf5f6 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -8053,8 +8053,6 @@ innobase_create_index_field_def(
 
 	col_type = get_innobase_type_from_mysql_type(&is_unsigned, field);
 
-	index_field->col_type = col_type;
-
 	if (DATA_BLOB == col_type
 	    || (key_part->length < field->pack_length()
 		&& field->type() != MYSQL_TYPE_VARCHAR)
@@ -8137,7 +8135,6 @@ innobase_copy_index_field_def(
 	DBUG_ASSERT(field != NULL);
 	DBUG_ASSERT(index_field != NULL);
 
-	index_field->col_type = (field->col->prtype & 0xFFUL);
 	index_field->field_name = mem_heap_strdup(heap, field->name);
 	index_field->prefix_len = field->prefix_len;
 
diff --git a/include/row0merge.h b/include/row0merge.h
index 515500d252d..c731d39d89c 100644
--- a/include/row0merge.h
+++ b/include/row0merge.h
@@ -24,7 +24,6 @@ Created 13/06/2005 Jan Lindstrom
 /* This structure holds index field definitions */
 
 struct merge_index_field_struct {
-	ulint	col_type;	/* Column type */
 	ulint	prefix_len;	/* Prefix len */
 	char*	field_name;	/* Field name */
 };