diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /storage/maria/ha_s3.cc | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'storage/maria/ha_s3.cc')
| -rw-r--r-- | storage/maria/ha_s3.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc index 0abb3f07..d8bc7e86 100644 --- a/storage/maria/ha_s3.cc +++ b/storage/maria/ha_s3.cc @@ -264,6 +264,7 @@ ha_s3::ha_s3(handlerton *hton, TABLE_SHARE *table_arg) /* Remove things that S3 doesn't support */ int_table_flags&= ~(HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_CAN_EXPORT); + int_table_flags|= HA_NO_ONLINE_ALTER; can_enable_indexes= 0; } @@ -852,7 +853,7 @@ static int s3_discover_table_existence(handlerton *hton, const char *db, */ static int s3_discover_table_names(handlerton *hton __attribute__((unused)), - LEX_CSTRING *db, + const LEX_CSTRING *db, MY_DIR *dir __attribute__((unused)), handlerton::discovered_list *result) { |