List:Internals« Previous MessageNext Message »
From:Marko Mäkelä Date:March 8 2005 3:08pm
Subject:bk commit into 4.0 tree (marko:1.2078)
View as plain text  
Below is the list of changes that have just been committed into a local
4.0 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.2078 05/03/08 17:08:17 marko@stripped +1 -0
  dict0load.c:
    dict_load_table(): Remove the check for row_format=compact for now,
    because the flag bit we used (high-order bit of mix_len)
    has not been zero for at least two customers.

  innobase/dict/dict0load.c
    1.17 05/03/08 17:06:01 marko@stripped +0 -16
    dict_load_table(): Remove the check for row_format=compact for now,
    because the flag bit we used (high-order bit of mix_len)
    has not been zero for at least two customers.

# 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/k/mysql-4.0

--- 1.16/innobase/dict/dict0load.c	Mon Dec 13 12:30:32 2004
+++ 1.17/innobase/dict/dict0load.c	Tue Mar  8 17:06:01 2005
@@ -647,22 +647,6 @@
 		return(NULL);
 	}
 
-#if MYSQL_VERSION_ID < 50300
-	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
-	"compact format" flag. */
-	field = rec_get_nth_field(rec, 7, &len);
-	if (mach_read_from_1(field) & 0x80) {
-		btr_pcur_close(&pcur);
-		mtr_commit(&mtr);
-		mem_heap_free(heap);
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: table %s is in the new compact format\n"
-			"InnoDB: of MySQL 5.0.3 or later\n", name);
-		return(NULL);
-	}
-#endif /* MYSQL_VERSION_ID < 50300 */
-
 	ut_a(0 == ut_strcmp((char *) "SPACE",
 		dict_field_get_col(
 		dict_index_get_nth_field(
Thread
bk commit into 4.0 tree (marko:1.2078)Marko Mäkelä8 Mar