diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-02-05 17:52:41 +0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-02-05 17:52:41 +0400 |
| commit | b911f9b0c0783e07f6bc9f091c9b5855730d88ba (patch) | |
| tree | b9e82e52a3296de1144b4e4974693d18b61e26a7 | |
| parent | 22b2067aa5cce55ea4652cb915f5ba99d9caa4a6 (diff) | |
| download | mariadb-git-b911f9b0c0783e07f6bc9f091c9b5855730d88ba.tar.gz | |
code cleanup
| -rw-r--r-- | mysql-test/t/init_file.test | 12 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/mysql-test/t/init_file.test b/mysql-test/t/init_file.test index 8cfb8c490e2..eb4c24871db 100644 --- a/mysql-test/t/init_file.test +++ b/mysql-test/t/init_file.test @@ -1,12 +1,4 @@ # -# This test is first part of test init_file_part2.test (bug #2526) +# This test is for bug #2526 "--init-file crashes MySQL if contains large select" +# Have a look at code in init_file.sql # - -#DROP TABLE IF EXISTS t1; - -#CREATE TABLE t1 -#( -# i int(11) default NULL -#) TYPE=MyISAM; - -#INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
\ No newline at end of file diff --git a/sql/sql_class.cc b/sql/sql_class.cc index fac99be47a8..c45167e82da 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -495,7 +495,7 @@ bool select_send::send_data(List<Item> &items) } } thd->sent_row_count++; - if (thd->bootstrap) + if (!thd->net.vio) DBUG_RETURN(0); bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length()); DBUG_RETURN(error); |