Commit dfe098fe authored by unknown's avatar unknown

Fixed after-merge problems.

parent 7a278092
......@@ -193,7 +193,7 @@ enum ha_extra_function {
begin and end of a statement.
*/
HA_EXTRA_ATTACH_CHILDREN,
HA_EXTRA_DETACH_CHILDREN
HA_EXTRA_DETACH_CHILDREN,
/* Inform handler that we will do a rename */
HA_EXTRA_PREPARE_FOR_RENAME
};
......
......@@ -341,7 +341,7 @@ typedef struct st_mi_sort_param
uchar *rec_buff;
void *wordlist, *wordptr;
MEM_ROOT wordroot;
char *record;
uchar *record;
MY_TMPDIR *tmpdir;
/*
......
......@@ -30,7 +30,6 @@ my_error_reporter my_getopt_error_reporter= &default_reporter;
static int findopt(char *, uint, const struct my_option **, char **);
my_bool getopt_compare_strings(const char *, const char *, uint);
static longlong getopt_ll(char *arg, const struct my_option *optp, int *err);
static longlong getopt_ll_limit_value(longlong, const struct my_option *);
static ulonglong getopt_ull(char *, const struct my_option *, int *);
static double getopt_double(char *arg, const struct my_option *optp, int *err);
static void init_variables(const struct my_option *options,
......@@ -789,7 +788,7 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err)
Returns "fixed" value.
*/
static longlong getopt_ll_limit_value(longlong num, const struct my_option *optp,
longlong getopt_ll_limit_value(longlong num, const struct my_option *optp,
bool *fix)
{
longlong old= num;
......@@ -859,7 +858,7 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err)
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
bool *fix);
bool *fix)
{
bool adjusted= FALSE;
ulonglong old= num;
......@@ -965,25 +964,27 @@ static void init_one_value(const struct my_option *optp, uchar* *variable,
*((my_bool*) variable)= (my_bool) value;
break;
case GET_INT:
*((int*) variable)= (int) getopt_ll_limit_value(value, optp);
*((int*) variable)= (int) getopt_ll_limit_value(value, optp, NULL);
break;
case GET_UINT:
*((uint*) variable)= (uint) getopt_ull_limit_value(value, optp);
*((uint*) variable)= (uint) getopt_ull_limit_value(value, optp, NULL);
break;
case GET_ENUM:
*((uint*) variable)= (uint) value;
break;
case GET_LONG:
*((long*) variable)= (long) getopt_ll_limit_value(value, optp);
*((long*) variable)= (long) getopt_ll_limit_value(value, optp, NULL);
break;
case GET_ULONG:
*((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp);
*((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp, NULL);
break;
case GET_LL:
*((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp);
*((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp,
NULL);
break;
case GET_ULL:
*((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp);
*((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp,
NULL);
break;
case GET_SET:
*((ulonglong*) variable)= (ulonglong) value;
......
......@@ -555,7 +555,7 @@ FT_INFO * maria_ft_init_boolean_search(MARIA_HA *info, uint keynr, uchar *query,
ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
sizeof(FTB_WORD *)*ftb->queue.elements);
memcpy(ftb->list, ftb->queue.root+1, sizeof(FTB_WORD *)*ftb->queue.elements);
qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),
my_qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),
(qsort2_cmp)FTB_WORD_cmp_list, ftb->charset);
if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
ftb->state=READY;
......
......@@ -295,7 +295,8 @@ FT_INFO *maria_ft_init_nlq_search(MARIA_HA *info, uint keynr, uchar *query,
&dptr, left_root_right);
if (flags & FT_SORTED)
qsort2(dlist->doc, dlist->ndocs, sizeof(FT_DOC), (qsort2_cmp)&FT_DOC_cmp, 0);
my_qsort2(dlist->doc, dlist->ndocs, sizeof(FT_DOC),
(qsort2_cmp)&FT_DOC_cmp, 0);
err:
delete_tree(&aio.dtree);
......
......@@ -653,7 +653,7 @@ static int write_keys(MARIA_SORT_PARAM *info, register uchar **sort_keys,
uint sort_length=info->key_length;
DBUG_ENTER("write_keys");
qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
info);
if (!my_b_inited(tempfile) &&
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
......@@ -696,7 +696,7 @@ static int write_keys_varlen(MARIA_SORT_PARAM *info,
int err;
DBUG_ENTER("write_keys_varlen");
qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp,
info);
if (!my_b_inited(tempfile) &&
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
......@@ -740,7 +740,7 @@ static int write_index(MARIA_SORT_PARAM *info,
{
DBUG_ENTER("write_index");
qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*),
my_qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*),
(qsort2_cmp) info->key_cmp,info);
while (count--)
{
......
......@@ -1429,7 +1429,7 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info,int extend)
then recrate all indexes.
*/
static int mi_drop_all_indexes(MI_CHECK *param, MI_INFO *info, my_bool force)
static int mi_drop_all_indexes(HA_CHECK *param, MI_INFO *info, my_bool force)
{
MYISAM_SHARE *share= info->s;
MI_STATE_INFO *state= &share->state;
......@@ -2671,14 +2671,14 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info,
/*
Quick repair (not touching data file, rebuilding indexes):
{
Read cache is (MI_CHECK *param)->read_cache using info->dfile.
Read cache is (HA_CHECK *param)->read_cache using info->dfile.
}
Non-quick repair (rebuilding data file and indexes):
{
Master thread:
Read cache is (MI_CHECK *param)->read_cache using info->dfile.
Read cache is (HA_CHECK *param)->read_cache using info->dfile.
Write cache is (MI_INFO *info)->rec_cache using new_file.
Slave threads:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment