database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Test case for fix assertion/hang in read_init_file()

Browse Source
This commit is contained in:
Monty
2016-09-15 21:56:01 +03:00
parent 55eb6fa5da
commit 7ca60dd842
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/init_file.opt
View File

@ -1 +1 @@
--init-file=$MYSQL_TEST_DIR/std_data/init_file.dat --init-file=$MYSQL_TEST_DIR/std_data/init_file.dat --log-bin=mariadb-bin

3
sql/mysqld.cc
View File

@ -6297,7 +6297,8 @@ int mysqld_main(int argc, char **argv)
/** /**
Execute all commands from a file. Used by the mysql_install_db script to Execute all commands from a file. Used by the mysql_install_db script to
create MySQL privilege tables without having to start a full MySQL server. create MySQL privilege tables without having to start a full MySQL server
and by read_init_file() if mysqld was started with the option --init-file.
*/ */
static void bootstrap(MYSQL_FILE *file) static void bootstrap(MYSQL_FILE *file)