diff options
| author | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
| commit | dac6498f9b5b28d94473baf46c6e6f174943728d (patch) | |
| tree | d3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /sql/filesort.cc | |
| parent | 305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff) | |
| parent | e60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff) | |
| download | mariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz | |
Merge with 4.0
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 53af60b0370..fab666a1203 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -223,7 +223,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, if (error) my_error(ER_FILSORT_ABORT,MYF(ME_ERROR+ME_WAITTANG)); else - statistic_add(filesort_rows, records, &LOCK_status); + statistic_add(filesort_rows, (ulong) records, &LOCK_status); *examined_rows= param.examined_rows; #ifdef SKIP_DBUG_IN_FILESORT DBUG_POP(); /* Ok to DBUG */ @@ -724,7 +724,7 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, org_max_rows=max_rows=param->max_rows; if (init_queue(&queue,(uint) (Tb-Fb)+1,offsetof(BUFFPEK,key),0, - (int (*) (void *, byte *,byte*)) + (queue_compare) (cmp=get_ptr_compare(sort_length)),(void*) &sort_length)) DBUG_RETURN(1); /* purecov: inspected */ for (buffpek= Fb ; buffpek <= Tb ; buffpek++) |