database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-04-29 09:05:15 +03:00
parent 503fd2115b 1fbdcada73
commit 0632b8034b
26 changed files with 2027 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.h
View File

@ -2453,11 +2453,14 @@ public:
*/
const char *unsupported_reason;
/** true when InnoDB should abort the alter when table is not empty */
bool error_if_not_empty;
Alter_inplace_info(HA_CREATE_INFO *create_info_arg,
Alter_info *alter_info_arg,
KEY *key_info_arg, uint key_count_arg,
partition_info *modified_part_info_arg,
bool ignore_arg);
bool ignore_arg, bool error_non_empty);
~Alter_inplace_info()
{