diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 07:32:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 07:32:09 +0300 |
| commit | 80591481549213f5701642e682cc2974b60c53dd (patch) | |
| tree | 05eaf4017f562b1b5d9525ef27c1383ebdc57c2d /storage/mroonga | |
| parent | 95ac7902969d31550768007b3062013db175d8cf (diff) | |
| parent | 8300f639a14afeb379c224e10dab9d99d31cecbd (diff) | |
| download | mariadb-git-80591481549213f5701642e682cc2974b60c53dd.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/mrn_table.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/mroonga/mrn_table.cpp b/storage/mroonga/mrn_table.cpp index 09bac98c153..eedb03544d0 100644 --- a/storage/mroonga/mrn_table.cpp +++ b/storage/mroonga/mrn_table.cpp @@ -932,7 +932,7 @@ MRN_SHARE *mrn_get_share(const char *table_name, TABLE *table, int *error) share->wrap_key_info = NULL; share->wrap_primary_key = MAX_KEY; } - memcpy(wrap_table_share, table->s, sizeof(*wrap_table_share)); + *wrap_table_share= *table->s; mrn_init_sql_alloc(current_thd, &(wrap_table_share->mem_root)); wrap_table_share->keys = share->wrap_keys; wrap_table_share->key_info = share->wrap_key_info; |