Add dict_col_get_clust_pos_noninline(), which was forgotten from r820.

dict/dict0dict.c

@@ -1272,6 +1272,18 @@ dict_table_remove_from_cache(
 	dict_mem_table_free(table);
 }
 
+/*************************************************************************
+Gets the column position in the clustered index. */
+
+ulint
+dict_col_get_clust_pos_noninline(
+/*=============================*/
+	const dict_col_t*	col,		/* in: table column */
+	const dict_index_t*	clust_index)	/* in: clustered index */
+{
+	return(dict_col_get_clust_pos(col, clust_index));
+}
+
 /********************************************************************
 If the given column name is reserved for InnoDB system columns, return
 TRUE. */

handler/ha_innodb.cc

@@ -3165,8 +3165,8 @@ build_template(
 		templ->col_no = i;
 
 		if (index == clust_index) {
-			templ->rec_field_no = dict_col_get_clust_pos
-				(&index->table->cols[i], index);
+			templ->rec_field_no = dict_col_get_clust_pos_noninline(
+				&index->table->cols[i], index);
 		} else {
 			templ->rec_field_no = dict_index_get_nth_col_pos(
 								index, i);
@@ -3225,9 +3225,9 @@ build_template(
 		for (i = 0; i < n_requested_fields; i++) {
 			templ = prebuilt->mysql_template + i;
 
-			templ->rec_field_no = dict_col_get_clust_pos
-				(&index->table->cols[templ->col_no],
-				 clust_index);
+			templ->rec_field_no = dict_col_get_clust_pos_noninline(
+				&index->table->cols[templ->col_no],
+				clust_index);
 		}
 	}
 }
@@ -3602,8 +3602,8 @@ calc_row_difference(
 			}
 
 			ufield->exp = NULL;
-			ufield->field_no = dict_col_get_clust_pos
-				(&prebuilt->table->cols[i], clust_index);
+			ufield->field_no = dict_col_get_clust_pos_noninline(
+				&prebuilt->table->cols[i], clust_index);
 			n_changed++;
 		}
 	}

include/dict0dict.h

@@ -98,6 +98,14 @@ dict_col_get_clust_pos(
 /*===================*/
 	const dict_col_t*	col,		/* in: table column */
 	const dict_index_t*	clust_index);	/* in: clustered index */
+/*************************************************************************
+Gets the column position in the clustered index. */
+
+ulint
+dict_col_get_clust_pos_noninline(
+/*=============================*/
+	const dict_col_t*	col,		/* in: table column */
+	const dict_index_t*	clust_index);	/* in: clustered index */
 /********************************************************************
 If the given column name is reserved for InnoDB system columns, return
 TRUE. */