database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0


sql/sql_class.cc:
  Auto merged
This commit is contained in:
unknown
2004-02-05 17:53:46 +04:00
parent 91f51913fe b911f9b0c0
commit f79ff0f909
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/init_file-master.opt Normal file
View File

@ -0,0 +1 @@
--init-file=$MYSQL_TEST_DIR/t/init_file.sql

1
mysql-test/t/init_file.sql Normal file
View File

@ -0,0 +1 @@
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;

4
mysql-test/t/init_file.test Normal file
View File

@ -0,0 +1,4 @@
#
# This test is for bug #2526 "--init-file crashes MySQL if contains large select"
# Have a look at code in init_file.sql
#

2
sql/sql_class.cc
View File

@ -495,6 +495,8 @@ bool select_send::send_data(List<Item> &items)
}
}
thd->sent_row_count++;
if (!thd->net.vio)
DBUG_RETURN(0);
bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length());
DBUG_RETURN(error);
}