diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
| commit | 6fb963be9dc000ef4ee3e002a01e25beb1d01e3a (patch) | |
| tree | 34afe6f3ea9173a0ef494d4a92246ce55b4f46a2 /storage | |
| parent | a00f8bc3ad3b04b543e2af400289f283fee5427c (diff) | |
| parent | 06401b6818d4f67d3e416785749dcbb8ea3230fb (diff) | |
| download | mariadb-git-10.4-broken-merge.tar.gz | |
WIP broken merge of 10.3 into 10.410.4-broken-merge
Some conflicts in sql/sql_acl.cc were incorrectly resolved,
causing various test failures. Here are some examples:
main.invisible_field_grant_system
main.invisible_field_grant_completely
main.read_only
main.sp-security
main.view_grant
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 7 | ||||
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 16 |
2 files changed, 11 insertions, 12 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 6031fcf3f98..f4150fccc84 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11097,7 +11097,8 @@ err_col: : ER_TABLESPACE_EXISTS, MYF(0), display_name); } - DBUG_RETURN(convert_error_code_to_mysql(err, m_flags, m_thd));} + DBUG_RETURN(convert_error_code_to_mysql(err, m_flags, m_thd)); +} /*****************************************************************//** Creates an index in an InnoDB database. */ @@ -12485,6 +12486,10 @@ create_table_info_t::create_table_update_dict() trx_free(m_trx); DBUG_RETURN(-1); } + + mutex_enter(&dict_sys->mutex); + fts_optimize_add_table(innobase_table); + mutex_exit(&dict_sys->mutex); } if (const Field* ai = m_form->found_next_number_field) { diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index f46c381fbf7..2be79c6c065 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1579,9 +1579,6 @@ row_fts_merge_insert( dict_table_t* aux_table; dict_index_t* aux_index; trx_t* trx; - byte trx_id_buf[6]; - roll_ptr_t roll_ptr = 0; - dfield_t* field; ut_ad(index); ut_ad(table); @@ -1692,16 +1689,13 @@ row_fts_merge_insert( dict_index_get_n_fields(aux_index)); /* Set TRX_ID and ROLL_PTR */ - trx_write_trx_id(trx_id_buf, trx->id); - field = dtuple_get_nth_field(ins_ctx.tuple, 2); - dfield_set_data(field, &trx_id_buf, 6); + dfield_set_data(dtuple_get_nth_field(ins_ctx.tuple, 2), + &reset_trx_id, DATA_TRX_ID_LEN); + dfield_set_data(dtuple_get_nth_field(ins_ctx.tuple, 3), + &reset_trx_id + DATA_TRX_ID_LEN, DATA_ROLL_PTR_LEN); - field = dtuple_get_nth_field(ins_ctx.tuple, 3); - dfield_set_data(field, &roll_ptr, 7); + ut_d(ins_ctx.aux_index_id = id); -#ifdef UNIV_DEBUG - ins_ctx.aux_index_id = id; -#endif const ulint space = table->space_id; for (i = 0; i < fts_sort_pll_degree; i++) { |