Commit 219d5cf2 authored by unknown's avatar unknown
Browse files

Applied innodb-4.1-ss26 snapshot. 

 Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-4.1-ss26 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (Bug#19366).
parent 38b1f7c7

innobase/include/dict0dict.ic

+0 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ dict_table_get_n_user_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols - DATA_N_SYS_COLS);

}
@@ -127,7 +126,6 @@ dict_table_get_n_cols( 
{

	ut_ad(table);

	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);

	ut_ad(table->cached);

	

	return(table->n_cols);

}