database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

code cleanup

Browse Source
This commit is contained in:
vva@eagle.mysql.r18.ru
2004-02-05 17:52:41 +04:00
parent 7769e5a677
commit fedeafaef0
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/t/init_file.test
View File

@ -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);

2
sql/sql_class.cc
View File

@ -495,7 +495,7 @@ bool select_send::send_data(List<Item> &items)
} }
} }
thd->sent_row_count++; thd->sent_row_count++;
if (thd->bootstrap) if (!thd->net.vio)
DBUG_RETURN(0); 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);