diff options
| author | unknown <serg@serg.mysql.com> | 2002-04-28 21:27:21 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-04-28 21:27:21 +0000 |
| commit | 78f10c244698ff80d7aaeb7c05e7e43276fa22a4 (patch) | |
| tree | df2243b05953bf7ef0afc57192f32a4f1292fe56 /myisam | |
| parent | 1074cf635c0d5470c5b6138576a0d8bf559b1cd4 (diff) | |
| parent | f508ec93b167eaec951d196d51c59baadbdfc55b (diff) | |
| download | mariadb-git-78f10c244698ff80d7aaeb7c05e7e43276fa22a4.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
sql/slave.cc:
Auto merged
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 66a8254732a..bec77b231b8 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -122,7 +122,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+ HA_FT_MAXLEN, MYF(0)))) { - if (init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer, + if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer, maxbuffer/2)) my_free((gptr) sort_keys,MYF(0)); else |