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

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

mysql-test/t/init_file-master.opt

---init-file=$MYSQL_TEST_DIR/t/init_file.sql
\ No newline at end of file
+--init-file=$MYSQL_TEST_DIR/std_data/init_file.dat

mysql-test/t/init_file.test

 #
-# This test is for bug #2526 "--init-file crashes MySQL if contains large select"
-# Have a look at code in init_file.sql 
+# This is a regression test for bug #2526 "--init-file crashes MySQL if it
+# contains a large select"
+#
+# See mysql-test/std_data/init_file.dat and
+# mysql-test/t/init_file-master.opt for the actual test
 #