database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

changes to match upmerge from 10.4

Browse Source
This commit is contained in:
DavidHall
2021-02-09 12:17:12 -06:00
committed by Roman Nozdrin
parent 27242f2363
commit 907e99cf20
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_mcs_ddl.cpp
View File

@ -2374,14 +2374,14 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
(thd->lex->create_info.like())) (thd->lex->create_info.like()))
{ {
TABLE_SHARE *share = table_arg->s; 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]; char datatype_buf[MAX_FIELD_WIDTH], def_value_buf[MAX_FIELD_WIDTH];
String datatype, def_value; String datatype, def_value;
ostringstream oss; ostringstream oss;
string tbl_name = "`" + string(share->db.str) + "`.`" + string(share->table_name.str) + "`"; string tbl_name = "`" + string(share->db.str) + "`.`" + string(share->table_name.str) + "`";
// Save the current read_set map and mark it for read // 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 << " ("; 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 << ";"; oss << ";";
stmt = oss.str(); 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); rc = ProcessDDLStatement(stmt, db, tbl, tid2sid(thd->thread_id), emsg, compressiontype, isAnyAutoincreCol, startValue, columnName, create_info->default_table_charset);