diff options
| author | monty@mysql.com <> | 2005-01-15 12:28:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-15 12:28:38 +0200 |
| commit | a37e91e4353e959764dc7ed5d62847727999b912 (patch) | |
| tree | e3a0da70f844473e00b8fb81958bb7d0607dc880 /sql/filesort.cc | |
| parent | b8dc0c5d93c77f7f5ae62468bc8b6043c587c9e9 (diff) | |
| download | mariadb-git-a37e91e4353e959764dc7ed5d62847727999b912.tar.gz | |
Changed interface for my_strntod() to make it more general and more portable
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 0a4e747a136..b79ea6515c3 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -567,10 +567,10 @@ write_keys(SORTPARAM *param, register uchar **sort_keys, uint count, if (!my_b_inited(tempfile) && open_cached_file(tempfile, mysql_tmpdir, TEMP_PREFIX, DISK_BUFFER_SIZE, MYF(MY_WME))) - goto err; /* purecov: inspected */ + goto err; /* purecov: inspected */ buffpek.file_pos= my_b_tell(tempfile); if ((ha_rows) count > param->max_rows) - count=(uint) param->max_rows; /* purecov: inspected */ + count=(uint) param->max_rows; /* purecov: inspected */ buffpek.count=(ha_rows) count; for (end=sort_keys+count ; sort_keys != end ; sort_keys++) if (my_b_write(tempfile, (byte*) *sort_keys, (uint) rec_length)) @@ -844,6 +844,7 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer, if (flush_io_cache(to_file)) break; /* purecov: inspected */ temp=from_file; from_file=to_file; to_file=temp; + *maxbuffer= (uint) (lastbuff-buffpek)-1; } close_cached_file(to_file); // This holds old result |