bk commit into 5.0 tree (aivanov:1.2115) BUG#19366

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2115 06/05/04 00:32:34 aivanov@stripped +1 -0
  Applied innodb-5.0-ss521 snapshot.
   Fixed BUG#19366: "consistent_snapshot.test fails".

  innobase/include/dict0dict.ic
    1.13 06/05/04 00:32:29 aivanov@stripped +0 -2
    Applied innodb-5.0-ss521 snapshot.
     Remove too strict assertions from some dict_table_t
     accessor functions (bug #19366).

# 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:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/innodb/mysql-5.0-ss521-work

--- 1.12/innobase/include/dict0dict.ic	2006-05-03 23:29:23 +04:00
+++ 1.13/innobase/include/dict0dict.ic	2006-05-04 00:32:29 +04:00
@@ -92,7 +92,6 @@
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
 	
 	return(table->n_cols - DATA_N_SYS_COLS);
 }
@@ -126,7 +125,6 @@
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
 	
 	return(table->n_cols);
 }