diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-28 15:21:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-28 15:21:29 +0300 |
| commit | e00877807719dac0eaba1447f5fdf01c9dc3dfd9 (patch) | |
| tree | b57011a850ae598fe5b9c32152d6ac71cbc93576 /myisam | |
| parent | dee95de0f70e5db0ee7464f2f6e286980eec7c9c (diff) | |
| parent | 86d5987694ed0067f89ca4ba21fecbe8744b3cd4 (diff) | |
| download | mariadb-git-e00877807719dac0eaba1447f5fdf01c9dc3dfd9.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 323983b05f8..65b606f7a68 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -701,7 +701,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, if (init_queue(&queue,(uint) (Tb-Fb)+1,offsetof(BUFFPEK,key),0, (int (*)(void*, byte *,byte*)) info->key_cmp, - (void*) info->sort_info)) + (void*) info)) DBUG_RETURN(1); /* purecov: inspected */ for (buffpek= Fb ; buffpek <= Tb ; buffpek++) |