diff options
| author | monty@mysql.com <> | 2004-06-25 18:49:36 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-25 18:49:36 +0300 |
| commit | f6765146c1b97bbb71f79adbd275dc2b6ca79333 (patch) | |
| tree | 3a9126456bcc45a3caaf4b6c53da125de2769da8 /sql/filesort.cc | |
| parent | 00dc9a0e91835f4cae34d287b4351667fe7fe4dc (diff) | |
| download | mariadb-git-f6765146c1b97bbb71f79adbd275dc2b6ca79333.tar.gz | |
Added missing root user to mysql.user on windows. (Bug #4242)
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 90129dd4d51..a84fa4fe6f4 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -373,7 +373,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->ha_rnd_init(); + file->ha_rnd_init(1); file->extra_opt(HA_EXTRA_CACHE, current_thd->variables.read_buff_size); } |