1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

S3: Don't do discover in mysql database (makes boot faster and safer)

Browse Source
This commit is contained in:
Monty 2019-06-26 18:22:18 +03:00
parent 9ca517613a
commit f44c687815
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/maria/ha_s3.cc
View File

@ -569,6 +569,10 @@ static int s3_discover_table_existance(handlerton *hton, const char *db,
int res; int res;
DBUG_ENTER("s3_discover_table_existance"); 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)) if (s3_info_init(&s3_info))
DBUG_RETURN(0); DBUG_RETURN(0);
if (!(s3_client= s3_open_connection(&s3_info))) if (!(s3_client= s3_open_connection(&s3_info)))
@ -601,6 +605,10 @@ static int s3_discover_table_names(handlerton *hton __attribute__((unused)),
int error; int error;
DBUG_ENTER("s3_discover_table_names"); 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)) if (s3_info_init(&s3_info))
DBUG_RETURN(0); DBUG_RETURN(0);
if (!(s3_client= s3_open_connection(&s3_info))) if (!(s3_client= s3_open_connection(&s3_info)))