Commit b695bb46 authored by aivanov@mysql.com's avatar aivanov@mysql.com
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/home/alexi/innodb/mysql-4.1-ss26
parents 5c0012cb d546f0d9

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);

}