diff options
| author | Monty <monty@mariadb.org> | 2019-06-26 18:22:18 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-06-26 23:32:30 +0300 |
| commit | f44c687815ef072e09a8d51d793e2bca8bced61b (patch) | |
| tree | f785a1423931d8311fd8314e18d1220cdf1f2153 /storage | |
| parent | 9ca517613adeb70c8d056f009f258d6355bde4b0 (diff) | |
| download | mariadb-git-f44c687815ef072e09a8d51d793e2bca8bced61b.tar.gz | |
S3: Don't do discover in mysql database (makes boot faster and safer)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ha_s3.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc index 3589dcc539e..66f1acd047a 100644 --- a/storage/maria/ha_s3.cc +++ b/storage/maria/ha_s3.cc @@ -569,6 +569,10 @@ static int s3_discover_table_existance(handlerton *hton, const char *db, int res; DBUG_ENTER("s3_discover_table_existance"); + /* Ignore names in "mysql" database to speed up boot */ + if (!strcmp(db, MYSQL_SCHEMA_NAME.str)) + DBUG_RETURN(0); + if (s3_info_init(&s3_info)) DBUG_RETURN(0); if (!(s3_client= s3_open_connection(&s3_info))) @@ -601,6 +605,10 @@ static int s3_discover_table_names(handlerton *hton __attribute__((unused)), int error; DBUG_ENTER("s3_discover_table_names"); + /* Ignore names in "mysql" database to speed up boot */ + if (!strcmp(db->str, MYSQL_SCHEMA_NAME.str)) + DBUG_RETURN(0); + if (s3_info_init(&s3_info)) DBUG_RETURN(0); if (!(s3_client= s3_open_connection(&s3_info))) |