summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/handler0alter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/handler/handler0alter.cc')
-rw-r--r--storage/innobase/handler/handler0alter.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 66ad1d07d60..e5559345a98 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -2097,8 +2097,8 @@ name_ok:
index
@param[in] altered_table MySQL table that is being altered
@param[in] key_part MySQL key definition
-@param[out] index_field index field defition for key_part */
-static MY_ATTRIBUTE((nonnull(2,3)))
+@param[out] index_field index field definition for key_part */
+static MY_ATTRIBUTE((nonnull))
void
innobase_create_index_field_def(
bool new_clustered,
@@ -2113,10 +2113,6 @@ innobase_create_index_field_def(
DBUG_ENTER("innobase_create_index_field_def");
- ut_ad(key_part);
- ut_ad(index_field);
- ut_ad(altered_table);
-
field = new_clustered
? altered_table->field[key_part->fieldnr]
: key_part->field;
@@ -2178,8 +2174,6 @@ innobase_create_index_def(
DBUG_ENTER("innobase_create_index_def");
DBUG_ASSERT(!key_clustered || new_clustered);
- ut_ad(altered_table);
-
index->fields = static_cast<index_field_t*>(
mem_heap_alloc(heap, n_fields * sizeof *index->fields));
@@ -6905,7 +6899,6 @@ innobase_rename_columns_try(
uint i = 0;
ulint num_v = 0;
- DBUG_ASSERT(ctx);
DBUG_ASSERT(ha_alter_info->handler_flags
& Alter_inplace_info::ALTER_COLUMN_NAME);
@@ -7301,7 +7294,6 @@ innobase_update_foreign_try(
ulint i;
DBUG_ENTER("innobase_update_foreign_try");
- DBUG_ASSERT(ctx);
foreign_id = dict_table_get_highest_foreign_id(ctx->new_table);