diff options
| author | Monty <monty@mariadb.org> | 2019-04-15 18:16:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-05-13 14:01:45 +0300 |
| commit | a9499a3850f617529526848d9e9da86ee3f9f2e9 (patch) | |
| tree | 31f7851d536d121197ce151a71c06813f0ddd7ff /sql/handler.cc | |
| parent | 59e1525d744a4588e4778117e157fe9871accc77 (diff) | |
| download | mariadb-git-bb-maria-s3.tar.gz | |
MDEV-17841 S3 storage enginebb-maria-s3
A read-only storage engine that stores it's data in (aws) S3
To store data in S3 one could use ALTER TABLE:
ALTER TABLE table_name ENGINE=S3
libmarias3 integration done by Sergei Golubchik
libmarias3 created by Andrew Hutchings
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index d26a5730e81..629d995d247 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2572,9 +2572,10 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path, it's not an error if the table doesn't exist in the engine. warn the user, but still report DROP being a success */ - bool intercept= error == ENOENT || error == HA_ERR_NO_SUCH_TABLE; + bool intercept= (error == ENOENT || error == HA_ERR_NO_SUCH_TABLE || + error == HA_ERR_UNSUPPORTED); - if (!intercept || generate_warning) + if ((!intercept || generate_warning) && ! thd->is_error()) { /* Fill up strucutures that print_error may need */ dummy_share.path.str= (char*) path; @@ -2587,7 +2588,10 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path, file->print_error(error, MYF(intercept ? ME_WARNING : 0)); } if (intercept) + { + thd->clear_error(); error= 0; + } } delete file; |