From 907e99cf20d6077fc04b7fc4e71dab8b9a8a4b75 Mon Sep 17 00:00:00 2001 From: DavidHall Date: Tue, 9 Feb 2021 12:17:12 -0600 Subject: [PATCH] changes to match upmerge from 10.4 --- dbcon/mysql/ha_mcs_ddl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbcon/mysql/ha_mcs_ddl.cpp b/dbcon/mysql/ha_mcs_ddl.cpp index 3e827645b..61b0900a6 100644 --- a/dbcon/mysql/ha_mcs_ddl.cpp +++ b/dbcon/mysql/ha_mcs_ddl.cpp @@ -2374,14 +2374,14 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea (thd->lex->create_info.like())) { TABLE_SHARE *share = table_arg->s; - my_bitmap_map *old_map; // To save the read_set + MY_BITMAP *old_map; // To save the read_set char datatype_buf[MAX_FIELD_WIDTH], def_value_buf[MAX_FIELD_WIDTH]; String datatype, def_value; ostringstream oss; string tbl_name = "`" + string(share->db.str) + "`.`" + string(share->table_name.str) + "`"; // Save the current read_set map and mark it for read - old_map= tmp_use_all_columns(table_arg, table_arg->read_set); + old_map= tmp_use_all_columns(table_arg, &table_arg->read_set); oss << "CREATE TABLE " << tbl_name << " ("; @@ -2475,7 +2475,7 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea oss << ";"; stmt = oss.str(); - tmp_restore_column_map(table_arg->read_set, old_map); + tmp_restore_column_map(&table_arg->read_set, old_map); } rc = ProcessDDLStatement(stmt, db, tbl, tid2sid(thd->thread_id), emsg, compressiontype, isAnyAutoincreCol, startValue, columnName, create_info->default_table_charset);