diff options
| author | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
| commit | 1e311999950833cd81ca0788cd3656585c46d9ae (patch) | |
| tree | ca8974710746bb69b04a49bc64f938d0b1a8420a /sql/filesort.cc | |
| parent | 24a8dc2337a717ff340bac228383ef04437a4666 (diff) | |
| parent | 8462b8aeb83355fa6c5cb4f45ea0ed63ba9e0712 (diff) | |
| download | mariadb-git-1e311999950833cd81ca0788cd3656585c46d9ae.tar.gz | |
Merge with 4.1.3-beta
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 1a1547a9d67..fe2b3850197 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -341,7 +341,7 @@ static BUFFPEK *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count) { my_free((char*) tmp, MYF(0)); tmp=0; - } + } } DBUG_RETURN(tmp); } @@ -384,7 +384,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, if (sort_form->key_read) // QQ Can be removed after the reset file->extra(HA_EXTRA_KEYREAD); // QQ is removed next_pos=(byte*) 0; /* Find records in sequence */ - file->rnd_init(); + file->ha_rnd_init(1); file->extra_opt(HA_EXTRA_CACHE, current_thd->variables.read_buff_size); } @@ -439,7 +439,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, { DBUG_PRINT("info",("Sort killed by user")); (void) file->extra(HA_EXTRA_NO_CACHE); - file->rnd_end(); + file->ha_rnd_end(); DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */ } if (error == 0) @@ -469,7 +469,8 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, else { (void) file->extra(HA_EXTRA_NO_CACHE); /* End cacheing of records */ - file->rnd_end(); + if (!next_pos) + file->ha_rnd_end(); } DBUG_PRINT("test",("error: %d indexpos: %d",error,indexpos)); @@ -877,7 +878,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, if (param->not_killable) { killed= ¬_killable; - not_killable=THD::NOT_KILLED; + not_killable= THD::NOT_KILLED; } error=0; |