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

Making multi-table delete BETA !!

Browse Source 
mysql-test/t/multi_update.test:
  Making a test change the order of the tables, so that initalize_tables 
  would be tested properly
mysys/my_compress.c:
  Just changed my e-mail address .... ;o)
sql/filesort.cc:
  Making sure that merge_buffers can not be killed
sql/sql_class.h:
  Added initialize_tables
sql/sql_delete.cc:
  Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
  same as above
BitKeeper/etc/ignore:
  Added locked to the ignore list
This commit is contained in:
unknown
2001-07-01 13:20:53 +03:00
parent f246b61915
commit b291238171
7 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/filesort.cc
View File

@@ -685,7 +685,6 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
uchar *strpos;
BUFFPEK *buffpek,**refpek;
QUEUE queue;
volatile bool *killed= &current_thd->killed;
qsort2_cmp cmp;
DBUG_ENTER("merge_buffers");
@@ -739,10 +738,6 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
while (queue.elements > 1)
{
if (*killed)
{
error=1; goto err; /* purecov: inspected */
}
for (;;)
{
buffpek=(BUFFPEK*) queue_top(&queue);