bk commit into 5.1 tree (kent:1.2163)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2163 06/03/11 19:13:31 kent@stripped +3 -0
  dict0dict.h, dict0dict.c, ha_innodb.cc:
    Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()

  storage/innobase/include/dict0dict.h
    1.42 06/03/11 19:11:40 kent@stripped +8 -0
    Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()

  storage/innobase/dict/dict0dict.c
    1.77 06/03/11 19:11:40 kent@stripped +12 -0
    Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()

  sql/ha_innodb.cc
    1.260 06/03/11 19:11:39 kent@stripped +2 -2
    Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()

# 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:	kent
# Host:	c-4c4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.76/storage/innobase/dict/dict0dict.c	2006-03-10 17:22:03 +01:00
+++ 1.77/storage/innobase/dict/dict0dict.c	2006-03-11 19:11:40 +01:00
@@ -4520,3 +4520,15 @@
 	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);
+}

--- 1.41/storage/innobase/include/dict0dict.h	2006-03-10 17:22:04 +01:00
+++ 1.42/storage/innobase/include/dict0dict.h	2006-03-11 19:11:40 +01:00
@@ -496,6 +496,14 @@
 					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. */
 

--- 1.259/sql/ha_innodb.cc	2006-03-10 17:22:02 +01:00
+++ 1.260/sql/ha_innodb.cc	2006-03-11 19:11:39 +01:00
@@ -2312,7 +2312,7 @@
 	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 @@
 					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 {