diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:26:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:41:32 +0200 |
| commit | 514b305dfb2839c619a623bbdae5f21cf0077672 (patch) | |
| tree | 2f9700f05ccf0ddc7e46a547d9a191404e8dbbd7 /sql/sql_partition_admin.cc | |
| parent | de51acd03730311505677eb7212756e7126183b3 (diff) | |
| parent | 117291db8b35ddb4cd8c89ee4d8de888160b7163 (diff) | |
| download | mariadb-git-514b305dfb2839c619a623bbdae5f21cf0077672.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c
was skipped. In Galera 4, the implementation would seem to require
changes to the streaming replication.
In the tests archive.rnd_pos main.profiling, disable_ps_protocol
for SHOW STATUS and SHOW PROFILE commands until MDEV-18974
has been fixed.
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index 71ab7477391..11276aa5a64 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -96,7 +96,6 @@ bool Sql_cmd_alter_table_exchange_partition::execute(THD *thd) DBUG_ASSERT(!create_info.data_file_name && !create_info.index_file_name); WSREP_TO_ISOLATION_BEGIN_WRTCHK(NULL, NULL, first_table); - thd->prepare_logs_for_admin_command(); DBUG_RETURN(exchange_partition(thd, first_table, &alter_info)); #ifdef WITH_WSREP wsrep_error_label: @@ -193,8 +192,8 @@ static bool compare_table_with_partition(THD *thd, TABLE *table, DBUG_ENTER("compare_table_with_partition"); bool metadata_equal= false; - memset(&part_create_info, 0, sizeof(HA_CREATE_INFO)); - memset(&table_create_info, 0, sizeof(HA_CREATE_INFO)); + part_create_info.init(); + table_create_info.init(); update_create_info_from_table(&table_create_info, table); /* get the current auto_increment value */ |