Remove more remnants of mixed indexes.

btr/btr0cur.c

@@ -1514,11 +1514,8 @@ btr_cur_update_in_place(
 		row_upd_rec_sys_fields(rec, index, offsets, trx, roll_ptr);
 	}
 
-	/* FIXME: in a mixed tree, all records may not have enough ordering
-	fields for btr search: */
-
-	was_delete_marked = rec_get_deleted_flag
-		(rec, page_is_comp(buf_block_get_frame(block)));
+	was_delete_marked = rec_get_deleted_flag(
+		rec, page_is_comp(buf_block_get_frame(block)));
 
 	row_upd_rec_in_place(rec, offsets, update);
 

btr/btr0sea.c

@@ -974,8 +974,6 @@ btr_search_drop_page_hash_index(
 	offsets = NULL;
 
 	while (!page_rec_is_supremum(rec)) {
-		/* FIXME: in a mixed tree, not all records may have enough
-		ordering fields: */
 		offsets = rec_get_offsets(rec, index, offsets,
 					  n_fields + (n_bytes > 0), &heap);
 		ut_a(rec_offs_n_fields(offsets) == n_fields + (n_bytes > 0));
@@ -1191,8 +1189,6 @@ btr_search_build_page_hash_index(
 		}
 	}
 
-	/* FIXME: in a mixed tree, all records may not have enough ordering
-	fields: */
 	fold = rec_fold(rec, offsets, n_fields, n_bytes, tree_id);
 
 	if (side == BTR_SEARCH_LEFT_SIDE) {

data/data0type.c

@@ -270,8 +270,6 @@ dtype_print(
 		} else if (prtype == DATA_TRX_ID) {
 			fputs("DATA_TRX_ID", stderr);
 			len = DATA_TRX_ID_LEN;
-		} else if (prtype == DATA_MIX_ID) {
-			fputs("DATA_MIX_ID", stderr);
 		} else if (prtype == DATA_ENGLISH) {
 			fputs("DATA_ENGLISH", stderr);
 		} else {

dict/dict0boot.c

@@ -58,8 +58,7 @@ dict_hdr_get_new_id(
 	dulint		id;
 	mtr_t		mtr;
 
-	ut_ad((type == DICT_HDR_TABLE_ID) || (type == DICT_HDR_INDEX_ID)
-	      || (type == DICT_HDR_MIX_ID));
+	ut_ad((type == DICT_HDR_TABLE_ID) || (type == DICT_HDR_INDEX_ID));
 
 	mtr_start(&mtr);
 
@@ -141,6 +140,7 @@ dict_hdr_create(
 	mlog_write_dulint(dict_header + DICT_HDR_INDEX_ID,
 			  ut_dulint_create(0, DICT_HDR_FIRST_ID), mtr);
 
+	/* Obsolete, but we must initialize it to 0 anyway. */
 	mlog_write_dulint(dict_header + DICT_HDR_MIX_ID,
 			  ut_dulint_create(0, DICT_HDR_FIRST_ID), mtr);
 

dict/dict0crea.c

@@ -78,14 +78,14 @@ dict_create_sys_tables_tuple(
 	mach_write_to_4(ptr, DICT_TABLE_ORDINARY);
 
 	dfield_set_data(dfield, ptr, 4);
-	/* 6: MIX_ID ---------------------------*/
+	/* 6: MIX_ID (obsolete) ---------------------------*/
 	dfield = dtuple_get_nth_field(entry, 4);
 
 	ptr = mem_heap_alloc(heap, 8);
 	memset(ptr, 0, 8);
 
 	dfield_set_data(dfield, ptr, 8);
-	/* 7: MIX_LEN --------------------------*/
+	/* 7: MIX_LEN (obsolete) --------------------------*/
 
 	dfield = dtuple_get_nth_field(entry, 5);
 

dict/dict0dict.c

@@ -899,18 +899,12 @@ dict_table_add_to_cache(
 			       DATA_ROLL_PTR_LEN);
 #if DATA_ROLL_PTR != 2
 #error "DATA_ROLL_PTR != 2"
-#endif
-	dict_mem_table_add_col(table, "DB_MIX_ID", DATA_SYS,
-			       DATA_MIX_ID | DATA_NOT_NULL,
-			       DATA_MIX_ID_LEN);
-#if DATA_MIX_ID != 3
-#error "DATA_MIX_ID != 3"
 #endif
 
 	/* This check reminds that if a new system column is added to
 	the program, it should be dealt with here */
-#if DATA_N_SYS_COLS != 4
-#error "DATA_N_SYS_COLS != 4"
+#if DATA_N_SYS_COLS != 3
+#error "DATA_N_SYS_COLS != 3"
 #endif
 
 	row_len = 0;
@@ -1427,12 +1421,12 @@ dict_col_name_is_reserved(
 {
 	/* This check reminds that if a new system column is added to
 	the program, it should be dealt with here. */
-#if DATA_N_SYS_COLS != 4
-#error "DATA_N_SYS_COLS != 4"
+#if DATA_N_SYS_COLS != 3
+#error "DATA_N_SYS_COLS != 3"
 #endif
 
 	static const char*	reserved_names[] = {
-		"DB_ROW_ID", "DB_TRX_ID", "DB_ROLL_PTR", "DB_MIX_ID"
+		"DB_ROW_ID", "DB_TRX_ID", "DB_ROLL_PTR"
 	};
 
 	ulint			i;
@@ -3722,9 +3716,7 @@ dict_tree_t*
 dict_tree_create(
 /*=============*/
 				/* out, own: created tree */
-	dict_index_t*	index,	/* in: the index for which to create: in the
-				case of a mixed tree, this should be the
-				index of the cluster object */
+	dict_index_t*	index,	/* in: the index for which to create */
 	ulint		page_no)/* in: root page number of the index */
 {
 	dict_tree_t*	tree;

include/data0type.h

@@ -124,11 +124,7 @@ be less than 256 */
 #define	DATA_ROLL_PTR	2	/* rollback data pointer: 7 bytes */
 #define DATA_ROLL_PTR_LEN 7
 
-#define DATA_MIX_ID	3	/* mixed index label: a dulint, stored in
-				a row in a compressed form */
-#define DATA_MIX_ID_LEN	9	/* maximum stored length for mix id (in a
-				compressed dulint form) */
-#define	DATA_N_SYS_COLS 4	/* number of system columns defined above */
+#define	DATA_N_SYS_COLS 3	/* number of system columns defined above */
 
 /* Flags ORed to the precise data type */
 #define DATA_NOT_NULL	256	/* this is ORed to the precise type when

include/data0type.ic

@@ -363,9 +363,6 @@ dtype_get_fixed_size(
 	case DATA_SYS:
 #ifdef UNIV_DEBUG
 		switch (type->prtype & DATA_MYSQL_TYPE_MASK) {
-		default:
-			ut_ad(0);
-			return(0);
 		case DATA_ROW_ID:
 			ut_ad(type->len == DATA_ROW_ID_LEN);
 			break;
@@ -375,9 +372,9 @@ dtype_get_fixed_size(
 		case DATA_ROLL_PTR:
 			ut_ad(type->len == DATA_ROLL_PTR_LEN);
 			break;
-		case DATA_MIX_ID:
-			ut_ad(type->len == DATA_MIX_ID_LEN);
-			break;
+		default:
+			ut_ad(0);
+			return(0);
 		}
 #endif /* UNIV_DEBUG */
 	case DATA_CHAR:
@@ -455,9 +452,6 @@ dtype_get_min_size(
 	case DATA_SYS:
 #ifdef UNIV_DEBUG
 		switch (type->prtype & DATA_MYSQL_TYPE_MASK) {
-		default:
-			ut_ad(0);
-			return(0);
 		case DATA_ROW_ID:
 			ut_ad(type->len == DATA_ROW_ID_LEN);
 			break;
@@ -467,9 +461,9 @@ dtype_get_min_size(
 		case DATA_ROLL_PTR:
 			ut_ad(type->len == DATA_ROLL_PTR_LEN);
 			break;
-		case DATA_MIX_ID:
-			ut_ad(type->len == DATA_MIX_ID_LEN);
-			break;
+		default:
+			ut_ad(0);
+			return(0);
 		}
 #endif /* UNIV_DEBUG */
 	case DATA_CHAR:

include/dict0boot.h

@@ -103,7 +103,7 @@ dict_create(void);
 #define DICT_HDR_ROW_ID		0	/* The latest assigned row id */
 #define	DICT_HDR_TABLE_ID	8	/* The latest assigned table id */
 #define	DICT_HDR_INDEX_ID	16	/* The latest assigned index id */
-#define	DICT_HDR_MIX_ID		24	/* The latest assigned mix id */
+#define	DICT_HDR_MIX_ID		24	/* Obsolete, always 0. */
 #define	DICT_HDR_TABLES		32	/* Root of the table index tree */
 #define	DICT_HDR_TABLE_IDS	36	/* Root of the table index tree */
 #define	DICT_HDR_COLUMNS	40	/* Root of the column index tree */

include/dict0dict.h

@@ -727,9 +727,7 @@ dict_tree_t*
 dict_tree_create(
 /*=============*/
 				/* out, own: created tree */
-	dict_index_t*	index,	/* in: the index for which to create: in the
-				case of a mixed tree, this should be the
-				index of the cluster object */
+	dict_index_t*	index,	/* in: the index for which to create */
 	ulint		page_no);/* in: root page number of the index */
 /**************************************************************************
 Frees an index tree struct. */