bk commit into 4.1 tree (heikki:1.2129)

[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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2129 05/01/15 01:06:15 heikki@stripped +2 -0
  dict0load.c, dict0crea.c:
    Add diagnostic code to track corruption in mix_len; it was reported on the mailing list Jan 14, 2005

  innobase/dict/dict0load.c
    1.27 05/01/15 01:05:41 heikki@stripped +17 -0
    Add diagnostic code to track corruption in mix_len; it was reported on the mailing list Jan 14, 2005

  innobase/dict/dict0crea.c
    1.26 05/01/15 01:05:41 heikki@stripped +11 -0
    Add diagnostic code to track corruption in mix_len; it was reported on the mailing list Jan 14, 2005

# 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.25/innobase/dict/dict0crea.c	Tue Nov  2 08:58:42 2004
+++ 1.26/innobase/dict/dict0crea.c	Sat Jan 15 01:05:41 2005
@@ -81,6 +81,17 @@
 
 	dfield_set_data(dfield, ptr, 8);
 	/* 7: MIX_LEN --------------------------*/
+
+	/* Track corruption reported on mailing list Jan 14, 2005 */
+	if (table->mix_len != 0 && table->mix_len != 0x80000000) {
+		fprintf(stderr,
+"InnoDB: Error: mix_len is %lu in table %s\n", (ulong)table->mix_len,
+							table->name);
+		mem_analyze_corruption((byte*)&(table->mix_len));
+	
+		ut_error;
+	}
+
 	dfield = dtuple_get_nth_field(entry, 5);
 
 	ptr = mem_heap_alloc(heap, 4);

--- 1.26/innobase/dict/dict0load.c	Mon Dec 27 04:07:59 2004
+++ 1.27/innobase/dict/dict0load.c	Sat Jan 15 01:05:41 2005
@@ -729,6 +729,7 @@
 	ulint		space;
 	ulint		n_cols;
 	ulint		err;
+	ulint		mix_len;
 	mtr_t		mtr;
 	
 #ifdef UNIV_SYNC_DEBUG
@@ -773,6 +774,22 @@
 		mem_heap_free(heap);
 		
 		return(NULL);
+	}
+
+	/* Track a corruption bug reported on the MySQL mailing list Jan 14,
+	2005: mix_id 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 && mix_len != 0x80000000) {
+		ut_print_timestamp(stderr);
+		
+		fprintf(stderr,
+			"  InnoDB: table %s has a nonsensical mix len %lu\n",
+			name, (ulong)mix_len);
 	}
 
 #if MYSQL_VERSION_ID < 50300