Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0

into mysql.com:/space/my/mysql-4.0

Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
05d3ba09 · lenz@mysql.com · 2a45f3ee · e306876f · 05d3ba09 · 05d3ba09
Commit 05d3ba09 authored Feb 05, 2004 by lenz@mysql.com
Showing with 6 additions and 3 deletions

mysql-test/std_data/init_file.dat mysql-test/std_data/init_file.dat +0 -0

mysql-test/t/init_file-master.opt mysql-test/t/init_file-master.opt +1 -1

mysql-test/t/init_file.test mysql-test/t/init_file.test +5 -2

No files found.
--- a/mysql-test/t/init_file.sql
+++ b/mysql-test/t/init_file.sql
--- a/mysql-test/t/init_file-master.opt
+++ b/mysql-test/t/init_file-master.opt
--init-file=$MYSQL_TEST_DIR/t/init_file.sql
+--init-file=$MYSQL_TEST_DIR/std_data/init_file.dat
\ No newline at end of file
--- a/mysql-test/t/init_file.test
+++ b/mysql-test/t/init_file.test
 #
-# This test is for bug #2526 "--init-file crashes MySQL if contains large select"
+# This is a regression test for bug #2526 "--init-file crashes MySQL if it
-# Have a look at code in init_file.sql 
+# contains a large select"
+#
+# See mysql-test/std_data/init_file.dat and
+# mysql-test/t/init_file-master.opt for the actual test
 #