bk commit into 4.1 tree (heikki:1.2162) BUG#9526

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
4.1 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2162 05/04/04 19:41:52 heikki@stripped +1 -0
  ha_innodb.cc:
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old
tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do
not dare to allow InnoDB sometimes to see the type as an integer type for those old
tables

  sql/ha_innodb.cc
    1.187 05/04/04 19:41:36 heikki@stripped +7 -6
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old
tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do
not dare to allow InnoDB sometimes to see the type as an integer type for those old
tables

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-4.1

--- 1.186/sql/ha_innodb.cc	Mon Apr  4 19:26:49 2005
+++ 1.187/sql/ha_innodb.cc	Mon Apr  4 19:41:36 2005
@@ -2269,8 +2269,9 @@
 					get_field_offset(table, field);
 
 		templ->mysql_col_len = (ulint) field->pack_length();
-		templ->type = get_innobase_type_from_mysql_type(
-					&templ->is_unsigned, field);
+		templ->type = index->table->cols[i].type.mtype;
+		templ->is_unsigned = index->table->cols[i].type.prtype
+							& DATA_UNSIGNED;
 		templ->charset = dtype_get_charset_coll_noninline(
 				index->table->cols[i].type.prtype);
 
@@ -2698,8 +2699,9 @@
 		o_len = field->pack_length();
 		n_len = field->pack_length();
 
-		col_type = get_innobase_type_from_mysql_type(&is_unsigned,
-									field);
+		col_type = prebuilt->table->cols[i].type.mtype;
+		is_unsigned = prebuilt->table->cols[i].type.prtype &
+								DATA_UNSIGNED;
 		switch (col_type) {
 
 		case DATA_BLOB:
@@ -2741,8 +2743,7 @@
 					  (mysql_byte*)n_ptr, n_len, col_type,
 						is_unsigned);
 			ufield->exp = NULL;
-			ufield->field_no =
-					(prebuilt->table->cols + i)->clust_pos;
+			ufield->field_no = prebuilt->table->cols[i].clust_pos;
 			n_changed++;
 		}
 	}