dict_col_t: Reduce ord_part to one bit.

dict_index_add_to_cache(): Instead of incrementing ord_part, set it.

dict_index_remove_from_cache(): Do not touch ord_part.

dtype_t: Reduce mbminlen from 3 to 2 bits.

row_upd(): Add a UNIV_LIKELY hint around node->in_mysql_interface.

dict/dict0dict.c

@@ -1388,7 +1388,7 @@ dict_index_add_to_cache(
 
 		field = dict_index_get_nth_field(new_index, i);
 
-		dict_field_get_col(field)->ord_part++;
+		dict_field_get_col(field)->ord_part = 1;
 	}
 
 	/* Create an index tree memory object for the index */
@@ -1431,9 +1431,7 @@ dict_index_remove_from_cache(
 	dict_table_t*	table,	/* in: table */
 	dict_index_t*	index)	/* in, own: index */
 {
-	dict_field_t*	field;
 	ulint		size;
-	ulint		i;
 
 	ut_ad(table && index);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
@@ -1445,15 +1443,6 @@ dict_index_remove_from_cache(
 	ut_ad(index->tree->tree_index);
 	dict_tree_free(index->tree);
 
-	/* Decrement the ord_part counts in columns which are ordering */
-	for (i = 0; i < dict_index_get_n_unique(index); i++) {
-
-		field = dict_index_get_nth_field(index, i);
-
-		ut_ad(dict_field_get_col(field)->ord_part > 0);
-		(dict_field_get_col(field)->ord_part)--;
-	}
-
 	/* Remove the index from the list of indexes of the table */
 	UT_LIST_REMOVE(indexes, table->indexes, index);
 

include/data0type.h

@@ -412,7 +412,7 @@ struct dtype_struct{
 
 	/* the remaining fields do not affect alphabetical ordering: */
 
-	ulint	mbminlen:3;	/* minimum length of a character, in bytes */
+	ulint	mbminlen:2;	/* minimum length of a character, in bytes */
 	ulint	mbmaxlen:3;	/* maximum length of a character, in bytes */
 
 	ulint	len:16;		/* length; for MySQL data this is

include/dict0mem.h

@@ -125,8 +125,8 @@ struct dict_col_struct{
 				starting from 0) */
 	ulint		clust_pos:10;/* position of the column in the
 				clustered index */
-	ulint		ord_part:12;/* count of how many times this column
-				appears in ordering fields of an index */
+	ulint		ord_part:1;/* nonzero if this column appears
+				in ordering fields of an index */
 	const char*	name;	/* name */
 	dtype_t		type;	/* data type */
 };

row/row0upd.c

@@ -1832,7 +1832,7 @@ row_upd(
 
 	ut_ad(node && thr);
 
-	if (node->in_mysql_interface) {
+	if (UNIV_LIKELY(node->in_mysql_interface)) {
 
 		/* We do not get the cmpl_info value from the MySQL
 		interpreter: we must calculate it on the fly: */