bk commit into 5.1 tree (aivanov:1.2388)

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.1 repository of alexi. When alexi 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.2388 06/05/03 23:31:52 aivanov@stripped +1 -0
  Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
  into  mysql.com:/home/alexi/innodb/mysql-5.1
   Null-merge.

  storage/innobase/include/dict0dict.ic
    1.15 06/05/03 23:31:47 aivanov@stripped +0 -2
    Null-merge.

  storage/innobase/include/dict0dict.ic
    1.11.1.2 06/05/03 23:31:10 aivanov@stripped +0 -0
    Merge rename: innobase/include/dict0dict.ic -> storage/innobase/include/dict0dict.ic

# 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:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/innodb/mysql-5.1/RESYNC

--- 1.11.1.1/innobase/include/dict0dict.ic	2006-05-03 23:29:23 +04:00
+++ 1.15/storage/innobase/include/dict0dict.ic	2006-05-03 23:31:47 +04:00
@@ -92,8 +92,7 @@
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
-	
+
 	return(table->n_cols - DATA_N_SYS_COLS);
 }
 
@@ -126,8 +125,7 @@
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
-	
+
 	return(table->n_cols);
 }
 
@@ -164,7 +162,7 @@
 	ut_ad(sys < DATA_N_SYS_COLS);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
 
-	col = dict_table_get_nth_col(table, table->n_cols 
+	col = dict_table_get_nth_col(table, table->n_cols
 					   - DATA_N_SYS_COLS + sys);
 	ut_ad(col->type.mtype == DATA_SYS);
 	ut_ad(col->type.prtype == (sys | DATA_NOT_NULL));
@@ -190,6 +188,25 @@
 }
 
 /************************************************************************
+Check whether the table uses the compact page format. */
+UNIV_INLINE
+ibool
+dict_table_is_comp(
+/*===============*/
+					/* out: TRUE if table uses the
+					compact page format */
+	const dict_table_t*	table)	/* in: table */
+{
+	ut_ad(table);
+
+#if DICT_TF_COMPACT != TRUE
+#error
+#endif
+
+	return(UNIV_LIKELY(table->flags & DICT_TF_COMPACT));
+}
+
+/************************************************************************
 Gets the number of fields in the internal representation of an index,
 including fields added by the dictionary system. */
 UNIV_INLINE
@@ -202,7 +219,7 @@
 {
 	ut_ad(index);
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
-	
+
 	return(index->n_fields);
 }
 
@@ -222,7 +239,7 @@
 	ut_ad(index);
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
 	ut_ad(index->cached);
-	
+
 	return(index->n_uniq);
 }
 
@@ -241,7 +258,7 @@
 	ut_ad(index);
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
 	ut_ad(index->cached);
-	
+
 	if (index->type & DICT_CLUSTERED) {
 
 		return(dict_index_get_n_unique(index));
@@ -324,19 +341,6 @@
 	ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
 
 	return(index->tree);
-}	
-
-/*************************************************************************
-Gets the field order criterion. */
-UNIV_INLINE
-ulint
-dict_field_get_order(
-/*=================*/
-	dict_field_t*	field)
-{
-	ut_ad(field);
-
-	return(field->order);
 }
 
 /*************************************************************************
@@ -494,13 +498,13 @@
 UNIV_INLINE
 dict_table_t*
 dict_table_check_if_in_cache_low(
-/*==============================*/
+/*=============================*/
 					/* out: table, NULL if not found */
 	const char*	table_name)	/* in: table name */
 {
 	dict_table_t*	table;
 	ulint		table_fold;
-	
+
 	ut_ad(table_name);
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -525,14 +529,14 @@
 	const char*	table_name)	/* in: table name */
 {
 	dict_table_t*	table;
-	
+
 	ut_ad(table_name);
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 #endif /* UNIV_SYNC_DEBUG */
 
 	table = dict_table_check_if_in_cache_low(table_name);
-	
+
 	if (table == NULL) {
 		table = dict_load_table(table_name);
 	}
@@ -557,7 +561,7 @@
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 #endif /* UNIV_SYNC_DEBUG */
 	UT_NOT_USED(trx);
-	
+
 	/* Look for the table name in the hash table */
 	fold = ut_fold_dulint(table_id);
 
@@ -572,9 +576,9 @@
 
 		/* lock_push(trx, table, LOCK_DICT_MEM_FIX) */
 	}
-	
+
 	/* TODO: should get the type information from MySQL */
-	
+
 	return(table);
 }
 
@@ -587,9 +591,9 @@
 	dict_table_t*	table)	/* in: table to be released */
 {
 	mutex_enter(&(dict_sys->mutex));
-	
-	table->mem_fix--;	
-	
+
+	table->mem_fix--;
+
 	mutex_exit(&(dict_sys->mutex));
 }
 
@@ -604,7 +608,7 @@
 	const char*	name)	/* in: index name */
 {
 	dict_index_t*	index	= NULL;
-	
+
 	index = dict_table_get_first_index(table);
 
 	while (index != NULL) {
@@ -614,7 +618,7 @@
 		}
 
 		index = dict_table_get_next_index(index);
-	}	
-	
+	}
+
 	return(index);
 }