diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
| commit | d72eebaa3dbec025ec43d101a1c8055cfd1ddaef (patch) | |
| tree | 5b2dea3a82cbef8c6b0689ad02419d5bf4e2bf82 /storage | |
| parent | 4832b751ad47626f236e25067508230df72749e6 (diff) | |
| parent | 49854811fa499c70ddbf5d7d4daf22c97796b98e (diff) | |
| download | mariadb-git-d72eebaa3dbec025ec43d101a1c8055cfd1ddaef.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage')
| -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 dfa28222de5..9db992bb86d 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; |