summaryrefslogtreecommitdiff
path: root/myisam/sort.c
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-12 00:54:35 +0300
committerunknown <monty@donna.mysql.fi>2001-04-12 00:54:35 +0300
commitc255ceca596b91e439985b6a543fd9d858592e3a (patch)
tree24233cf112742394baadb954377539515a28de33 /myisam/sort.c
parent99c46a490c7761c17a5100eac58e0a6658d09ea2 (diff)
downloadmariadb-git-c255ceca596b91e439985b6a543fd9d858592e3a.tar.gz
Added SQL_CALC_FOUND_ROWS and FOUND_ROWS()
myisam/ft_boolean_search.c: Cleanup myisam/ft_parser.c: Cleanup myisam/ft_update.c: Cleanup myisam/sort.c: Cleanup BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisam/sort.c')
-rw-r--r--myisam/sort.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c
index 9f16ac35c9b..384c778ab54 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -116,9 +116,11 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
}
while ((maxbuffer= (int) (records/(keys-1)+1)) != skr);
- if (sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+HA_FT_MAXLEN, MYF(0)))
+ if ((sort_keys=(uchar **)my_malloc(keys*(sort_length+sizeof(char*))+
+ HA_FT_MAXLEN, MYF(0))))
{
- if (init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer, maxbuffer/2))
+ if (init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
+ maxbuffer/2))
my_free((gptr) sort_keys,MYF(0));
else
break;