Commit a7f0dca4 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents 786ca5b7 1ff3d3c9

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ ha_innobase::get_row_type() const 
	row_prebuilt_t*	prebuilt = (row_prebuilt_t*) innobase_prebuilt;



	if (prebuilt && prebuilt->table) {

		if (dict_table_is_comp(prebuilt->table)) {

		if (innodb_dict_table_is_comp(prebuilt->table)) {

			return(ROW_TYPE_COMPACT);

		} else {

			return(ROW_TYPE_REDUNDANT);
@@ -3705,7 +3705,7 @@ calc_row_difference( 
					TRUE,

					new_mysql_row_col,

					col_pack_len,

					dict_table_is_comp(prebuilt->table));

					innodb_dict_table_is_comp(prebuilt->table));

				ufield->new_val.data = dfield.data;

				ufield->new_val.len = dfield.len;

			} else {

storage/innobase/dict/dict0dict.c

+12 −0
Original line number Diff line number Diff line
@@ -4520,3 +4520,15 @@ dict_index_name_print( 
	fputs(" of table ", file);

	ut_print_name(file, trx, index->table_name);

}



/************************************************************************

Export an inlined function for use in ha_innodb.c. */

ibool

innodb_dict_table_is_comp(

/*===============*/

					/* out: TRUE if table uses the

					compact page format */

	const dict_table_t*	table)	/* in: table */

{

	return dict_table_is_comp(table);

}

storage/innobase/include/dict0dict.h

+8 −0
Original line number Diff line number Diff line
@@ -496,6 +496,14 @@ dict_table_is_comp( 
					compact page format */

	const dict_table_t*	table);	/* in: table */

/************************************************************************

Non inlined version of 'dict_table_is_comp' above. */

ibool

innodb_dict_table_is_comp(

/*===============*/

					/* out: TRUE if table uses the

					compact page format */

	const dict_table_t*	table);	/* in: table */

/************************************************************************

Checks if a column is in the ordering columns of the clustered index of a

table. Column prefixes are treated like whole columns. */