From fe7c2aaeeab289b09645748e2006a7a9409fbbfa Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 16 Dec 2012 21:11:24 +0100 Subject: MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails backport improved bootstrap error handling from 5.6 Was: revno: 3768.1.1 committer: Christopher Powers timestamp: Wed 2012-05-02 22:16:40 -0500 message: Bug#11766342 INITIAL DB CREATION FAILS ON WINDOWS WITH AN ASSERT IN SQL_ERROR.CC Improved bootstrap error handling: - Detect and report file i/o errors - Report query size errors with nearest query text --- mysql-test/t/init_file-master.opt | 1 - mysql-test/t/init_file.opt | 1 + mysql-test/t/init_file_longline_3816.opt | 1 + mysql-test/t/init_file_longline_3816.test | 5 +++++ 4 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 mysql-test/t/init_file-master.opt create mode 100644 mysql-test/t/init_file.opt create mode 100644 mysql-test/t/init_file_longline_3816.opt create mode 100644 mysql-test/t/init_file_longline_3816.test (limited to 'mysql-test/t') diff --git a/mysql-test/t/init_file-master.opt b/mysql-test/t/init_file-master.opt deleted file mode 100644 index 825311dabf2..00000000000 --- a/mysql-test/t/init_file-master.opt +++ /dev/null @@ -1 +0,0 @@ ---init-file=$MYSQL_TEST_DIR/std_data/init_file.dat diff --git a/mysql-test/t/init_file.opt b/mysql-test/t/init_file.opt new file mode 100644 index 00000000000..825311dabf2 --- /dev/null +++ b/mysql-test/t/init_file.opt @@ -0,0 +1 @@ +--init-file=$MYSQL_TEST_DIR/std_data/init_file.dat diff --git a/mysql-test/t/init_file_longline_3816.opt b/mysql-test/t/init_file_longline_3816.opt new file mode 100644 index 00000000000..9ddb6fa8565 --- /dev/null +++ b/mysql-test/t/init_file_longline_3816.opt @@ -0,0 +1 @@ +--init-file=$MYSQL_TEST_DIR/std_data/init_file_longline_3816.sql diff --git a/mysql-test/t/init_file_longline_3816.test b/mysql-test/t/init_file_longline_3816.test new file mode 100644 index 00000000000..5db2fcb0c73 --- /dev/null +++ b/mysql-test/t/init_file_longline_3816.test @@ -0,0 +1,5 @@ +# +# MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails +# +select count(*) from t4; + -- cgit v1.2.1