1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.5' into bb-10.6-release

This commit is contained in:
Oleksandr Byelkin
2022-08-03 10:47:52 +02:00
449 changed files with 6842 additions and 2256 deletions

View File

@@ -1042,9 +1042,9 @@ int bootstrap(MYSQL_FILE *file)
break;
case READ_BOOTSTRAP_QUERY_SIZE:
my_printf_error(ER_UNKNOWN_ERROR, "Boostrap file error. Query size "
my_printf_error(ER_UNKNOWN_ERROR, "Bootstrap file error. Query size "
"exceeded %d bytes near '%s'.", MYF(0),
MAX_BOOTSTRAP_LINE_SIZE, err_ptr);
MAX_BOOTSTRAP_QUERY_SIZE, err_ptr);
break;
default: