bk commit into 4.1 tree (marko:1.2096)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
4.1 repository of marko. When marko 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.2096 05/03/08 19:45:24 marko@stripped +1 -0
  dict0load.c:
    dict_load_table(): Do not complain about mix_len != 0,
    because MySQL 3.23.4x left garbage in that column.

  innobase/dict/dict0load.c
    1.30 05/03/08 19:44:21 marko@stripped +0 -17
    dict_load_table(): Do not complain about mix_len != 0,
    because MySQL 3.23.4x left garbage in that column.

# 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:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-4.1

--- 1.29/innobase/dict/dict0load.c	Tue Mar  8 17:18:20 2005
+++ 1.30/innobase/dict/dict0load.c	Tue Mar  8 19:44:21 2005
@@ -729,7 +729,6 @@
 	ulint		space;
 	ulint		n_cols;
 	ulint		err;
-	ulint		mix_len;
 	mtr_t		mtr;
 	
 #ifdef UNIV_SYNC_DEBUG
@@ -774,22 +773,6 @@
 		mem_heap_free(heap);
 		
 		return(NULL);
-	}
-
-	/* Track a corruption bug reported on the MySQL mailing list Jan 14,
-	2005: mix_len had a value different from 0 */
-
-	field = rec_get_nth_field(rec, 7, &len);
-	ut_a(len == 4);
-
-	mix_len = mach_read_from_4(field);
-
-	if (mix_len != 0) {
-		ut_print_timestamp(stderr);
-		
-		fprintf(stderr,
-			"  InnoDB: table %s has a nonsensical mix len %lu\n",
-			name, (ulong)mix_len);
 	}
 
 	ut_a(0 == ut_strcmp("SPACE",