Commit 99c42304 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-4.1 

into mysql.com:/home/hf/work/mysql-4.1.mrg
parents f0c693cc 6b02ec1c

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

}