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

MDEV-9077 - sys schema preparation

Browse Source 
- increase MAX_BOOTSTRAP_QUERY_SIZE (sys.schema has SP over 50K large)
  don't allocate bootstrap query on heap anymore.
- support DELIMITER in bootstrap
This commit is contained in:
Vladislav Vaintroub
2021-03-03 10:24:16 +01:00
parent 601c577142
commit 9186ff88da
5 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -978,6 +978,7 @@ int bootstrap(MYSQL_FILE *file)
DBUG_ENTER("handle_bootstrap");
THD *thd= new THD(next_thread_id());
char *buffer= new char[MAX_BOOTSTRAP_QUERY_SIZE];
#ifdef WITH_WSREP
thd->variables.wsrep_on= 0;
#endif
@ -1011,12 +1012,12 @@ int bootstrap(MYSQL_FILE *file)
for ( ; ; )
{
char buffer[MAX_BOOTSTRAP_QUERY_SIZE] = "";
buffer[0]= 0;
int rc, length;
char *query;
int error= 0;
rc= read_bootstrap_query(buffer, &length, file, fgets_fn, &error);
rc= read_bootstrap_query(buffer, &length, file, fgets_fn, 0, &error);
if (rc == READ_BOOTSTRAP_EOF)
break;
@ -1099,6 +1100,7 @@ int bootstrap(MYSQL_FILE *file)
thd->lex->restore_set_statement_var();
}
delete thd;
delete[] buffer;
DBUG_RETURN(bootstrap_error);
}