diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2004-02-04 21:35:20 +0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2004-02-04 21:35:20 +0400 |
| commit | 7f1e2e48fb96acadd8d8dcd2d20bb069dbfad536 (patch) | |
| tree | 18e8efebd1b528bcc7225649c305eb4da0716fad /sql/sql_class.cc | |
| parent | 9629e0d3c488ef05d90a112bc09e540d4421bff1 (diff) | |
| download | mariadb-git-7f1e2e48fb96acadd8d8dcd2d20bb069dbfad536.tar.gz | |
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
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3ea61da28fc..fac99be47a8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -495,6 +495,8 @@ bool select_send::send_data(List<Item> &items) } } thd->sent_row_count++; + if (thd->bootstrap) + DBUG_RETURN(0); bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length()); DBUG_RETURN(error); } |