diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:29:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:32:21 +0300 |
| commit | dbc716675b183dc972a40dd1320f4bdae04c1f29 (patch) | |
| tree | 65550afccea8fc9e0d47ba16a679eef44c7dab1a /storage/xtradb/handler/handler0alter.cc | |
| parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
| parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
| download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/handler/handler0alter.cc')
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index bdc7c72cf8b..638288cdb3c 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -1516,8 +1516,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, @@ -1532,10 +1532,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); - /* Virtual columns are not stored in InnoDB data dictionary, thus if there is virtual columns we need to skip them to find the correct field. */ @@ -1599,8 +1595,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)); index->ind_type = 0; @@ -4845,7 +4839,6 @@ innobase_rename_columns_try( ha_alter_info->alter_info->create_list); uint i = 0; - DBUG_ASSERT(ctx); DBUG_ASSERT(ha_alter_info->handler_flags & Alter_inplace_info::ALTER_COLUMN_NAME); @@ -5029,7 +5022,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); |