diff options
| author | unknown <lenz@mysql.com> | 2004-02-05 23:37:54 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-02-05 23:37:54 +0100 |
| commit | 00bcf494a7f1b5f14cd5f14be9dbc5b10209631e (patch) | |
| tree | 085d3dfa69c0b51d6209530b294735f2075c83fa | |
| parent | b40d4e127aea7beab7a81eb2a4588046fd58f129 (diff) | |
| parent | 62a4ae0761bc76326e3afc3d4fb7d598e593c3e8 (diff) | |
| download | mariadb-git-00bcf494a7f1b5f14cd5f14be9dbc5b10209631e.tar.gz | |
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
| -rw-r--r-- | mysql-test/std_data/init_file.dat (renamed from mysql-test/t/init_file.sql) | 0 | ||||
| -rw-r--r-- | mysql-test/t/init_file-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/t/init_file.test | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/t/init_file.sql b/mysql-test/std_data/init_file.dat index 4236ada1142..4236ada1142 100644 --- a/mysql-test/t/init_file.sql +++ b/mysql-test/std_data/init_file.dat diff --git a/mysql-test/t/init_file-master.opt b/mysql-test/t/init_file-master.opt index 1542f1f034e..825311dabf2 100644 --- a/mysql-test/t/init_file-master.opt +++ b/mysql-test/t/init_file-master.opt @@ -1 +1 @@ ---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 diff --git a/mysql-test/t/init_file.test b/mysql-test/t/init_file.test index eb4c24871db..604d0a01794 100644 --- a/mysql-test/t/init_file.test +++ b/mysql-test/t/init_file.test @@ -1,4 +1,7 @@ # -# 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 # |