diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-15 05:03:15 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-15 05:03:15 +0300 |
| commit | e96fcbcfe97c8d9f0b244071575b5ccc3248d5ff (patch) | |
| tree | 90883e19e7220eb27c1fa092220fe373c7e82d80 /sql/filesort.cc | |
| parent | 8d6348f650b544b65dea17ad853f1127cce78f79 (diff) | |
| download | mariadb-git-e96fcbcfe97c8d9f0b244071575b5ccc3248d5ff.tar.gz | |
Fixed multi-table-delete
Optimize fixed length MyISAM rows to use pread/pwrite.
BUILD/compile-pentium-debug-max:
Also build embedded server
libmysqld/lib_vio.c:
Add vio_poll_read()
myisam/mi_statrec.c:
Use pread()/pwrite() instead of seek+read/write
mysql-test/r/multi_update.result:
Fix multi-table-delete test
mysql-test/t/multi_update.test:
Fix multi-table-delete test
sql/filesort.cc:
Fix multi-table-delete
sql/mysql_priv.h:
Fix multi-table-delete
sql/sql_class.h:
Fix multi-table-delete
sql/sql_delete.cc:
Fix multi-table-delete
sql/sql_parse.cc:
Fix multi-table-delete
sql/sql_select.cc:
Fix multi-table-delete
sql/sql_table.cc:
cleanup
sql/sql_unions.cc:
cleanup
sql/sql_yacc.yy:
cleanup/ optimize
sql/structs.h:
Fix multi-table-delete
sql/uniques.cc:
Fix multi-table-delete
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 76f6bc4c33c..eec619fc7a6 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -724,6 +724,8 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, { error=1; goto err; /* purecov: inspected */ } + buffpek->key+=sort_length; + queue_replaced(&queue); // Top element has been used } else cmp=0; // Not unique |