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/innobase/row/row0merge.cc | |
| parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
| parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
| download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index a12a2a73ace..bd3acf5f063 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -4086,7 +4086,6 @@ row_merge_rename_index_to_add( "WHERE TABLE_ID = :tableid AND ID = :indexid;\n" "END;\n"; - ut_ad(trx); ut_a(trx->dict_operation_lock_mode == RW_X_LATCH); ut_ad(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX); @@ -4140,7 +4139,6 @@ row_merge_rename_index_to_drop( "WHERE TABLE_ID = :tableid AND ID = :indexid;\n" "END;\n"; - ut_ad(trx); ut_a(trx->dict_operation_lock_mode == RW_X_LATCH); ut_ad(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX); |