Commit 22b2067a authored by unknown's avatar unknown

added checking for bootstrap in select_send::send_data

(fixed bug #2526 "--init-file crashes MySQL if contains large select")
Such checking usually works in send_ok, send_eof, but in this case large 
result causes interim flushing.


sql/sql_class.cc:
  added checking for bootstrap in select_send::send_data
parent db77cba5
--init-file=$MYSQL_TEST_DIR/t/init_file.sql
\ No newline at end of file
select * from mysql.user as t1, mysql.user as t2, mysql.user as t3, mysql.user as t4, mysql.user as t5, mysql.user as t6, mysql.user as t7, mysql.user as t8;
\ No newline at end of file
#
# This test is first part of test init_file_part2.test (bug #2526)
#
#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
...@@ -495,6 +495,8 @@ bool select_send::send_data(List<Item> &items) ...@@ -495,6 +495,8 @@ bool select_send::send_data(List<Item> &items)
} }
} }
thd->sent_row_count++; thd->sent_row_count++;
if (thd->bootstrap)
DBUG_RETURN(0);
bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length()); bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length());
DBUG_RETURN(error); DBUG_RETURN(error);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment