summaryrefslogtreecommitdiff
path: root/innobase/dict
diff options
context:
space:
mode:
Diffstat (limited to 'innobase/dict')
-rw-r--r--innobase/dict/dict0crea.c2
-rw-r--r--innobase/dict/dict0dict.c8
-rw-r--r--innobase/dict/dict0load.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/innobase/dict/dict0crea.c b/innobase/dict/dict0crea.c
index 36fa0fc640e..48fcb9c1e79 100644
--- a/innobase/dict/dict0crea.c
+++ b/innobase/dict/dict0crea.c
@@ -158,7 +158,7 @@ dict_create_sys_tables_tuple(
if (table->type == DICT_TABLE_CLUSTER_MEMBER) {
dfield_set_data(dfield, table->cluster_name,
ut_strlen(table->cluster_name));
- ut_a(0); /* Oracle-style clusters are not supported yet */
+ ut_error; /* Oracle-style clusters are not supported yet */
} else {
dfield_set_data(dfield, NULL, UNIV_SQL_NULL);
}
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index a9e0a5c4600..dc19997de72 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -208,7 +208,7 @@ dict_tables_have_same_db(
}
}
- ut_a(0);
+ ut_error;
return(FALSE);
}
@@ -231,7 +231,7 @@ dict_remove_db_name(
}
}
- ut_a(0);
+ ut_error;
return(NULL);
}
@@ -254,7 +254,7 @@ dict_get_db_name_len(
}
}
- ut_a(0);
+ ut_error;
return(0);
}
@@ -1172,7 +1172,7 @@ dict_table_LRU_trim(void)
dict_table_t* table;
dict_table_t* prev_table;
- ut_a(0);
+ ut_error;
#ifdef UNIV_SYNC_DEBUG
ut_ad(mutex_own(&(dict_sys->mutex)));
diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c
index d4b6a5ff9cb..5a5830a2517 100644
--- a/innobase/dict/dict0load.c
+++ b/innobase/dict/dict0load.c
@@ -673,7 +673,7 @@ dict_load_table(
table->type = mach_read_from_4(field);
if (table->type == DICT_TABLE_CLUSTER_MEMBER) {
- ut_a(0);
+ ut_error;
field = rec_get_nth_field(rec, 6, &len);
table->mix_id = mach_read_from_8(field);