Skip to content

M
MariaDB
Commit be71f3cc authored by unknown's avatar unknown
Browse files
Options

Fixed after-merge problems.

parent dd3bba09
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 24 deletions
include/my_base.h
View file @ be71f3cc
...@@ -193,7 +193,7 @@ enum ha_extra_function { ...@@ -193,7 +193,7 @@ enum ha_extra_function {
begin and end of a statement. begin and end of a statement.
*/ */
HA_EXTRA_ATTACH_CHILDREN, HA_EXTRA_ATTACH_CHILDREN,
HA_EXTRA_DETACH_CHILDREN HA_EXTRA_DETACH_CHILDREN,
/* Inform handler that we will do a rename */ /* Inform handler that we will do a rename */
HA_EXTRA_PREPARE_FOR_RENAME HA_EXTRA_PREPARE_FOR_RENAME
}; };
......
include/myisam.h
View file @ be71f3cc
...@@ -341,7 +341,7 @@ typedef struct st_mi_sort_param ...@@ -341,7 +341,7 @@ typedef struct st_mi_sort_param
uchar *rec_buff; uchar *rec_buff;
void *wordlist, *wordptr; void *wordlist, *wordptr;
MEM_ROOT wordroot; MEM_ROOT wordroot;
char *record; uchar *record;
MY_TMPDIR *tmpdir; MY_TMPDIR *tmpdir;
/* /*
......
mysys/my_getopt.c
View file @ be71f3cc
...@@ -30,7 +30,6 @@ my_error_reporter my_getopt_error_reporter= &default_reporter; ...@@ -30,7 +30,6 @@ my_error_reporter my_getopt_error_reporter= &default_reporter;
static int findopt(char *, uint, const struct my_option **, char **); static int findopt(char *, uint, const struct my_option **, char **);
my_bool getopt_compare_strings(const char *, const char *, uint); 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(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 ulonglong getopt_ull(char *, const struct my_option *, int *);
static double getopt_double(char *arg, const struct my_option *optp, int *err); static double getopt_double(char *arg, const struct my_option *optp, int *err);
static void init_variables(const struct my_option *options, 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) ...@@ -789,7 +788,7 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err)
Returns "fixed" value. 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) bool *fix)
{ {
longlong old= num; longlong old= num;
...@@ -859,7 +858,7 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err) ...@@ -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, ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
bool *fix); bool *fix)
{ {
bool adjusted= FALSE; bool adjusted= FALSE;
ulonglong old= num; ulonglong old= num;
...@@ -965,25 +964,27 @@ static void init_one_value(const struct my_option *optp, uchar* *variable, ...@@ -965,25 +964,27 @@ static void init_one_value(const struct my_option *optp, uchar* *variable,
*((my_bool*) variable)= (my_bool) value; *((my_bool*) variable)= (my_bool) value;
break; break;
case GET_INT: case GET_INT:
*((int*) variable)= (int) getopt_ll_limit_value(value, optp); *((int*) variable)= (int) getopt_ll_limit_value(value, optp, NULL);
break; break;
case GET_UINT: case GET_UINT:
*((uint*) variable)= (uint) getopt_ull_limit_value(value, optp); *((uint*) variable)= (uint) getopt_ull_limit_value(value, optp, NULL);
break; break;
case GET_ENUM: case GET_ENUM:
*((uint*) variable)= (uint) value; *((uint*) variable)= (uint) value;
break; break;
case GET_LONG: case GET_LONG:
*((long*) variable)= (long) getopt_ll_limit_value(value, optp); *((long*) variable)= (long) getopt_ll_limit_value(value, optp, NULL);
break; break;
case GET_ULONG: case GET_ULONG:
*((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp); *((ulong*) variable)= (ulong) getopt_ull_limit_value(value, optp, NULL);
break; break;
case GET_LL: case GET_LL:
*((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp); *((longlong*) variable)= (longlong) getopt_ll_limit_value(value, optp,
NULL);
break; break;
case GET_ULL: case GET_ULL:
*((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp); *((ulonglong*) variable)= (ulonglong) getopt_ull_limit_value(value, optp,
NULL);
break; break;
case GET_SET: case GET_SET:
*((ulonglong*) variable)= (ulonglong) value; *((ulonglong*) variable)= (ulonglong) value;
......
storage/maria/ma_ft_boolean_search.c
View file @ be71f3cc
...@@ -555,7 +555,7 @@ FT_INFO * maria_ft_init_boolean_search(MARIA_HA *info, uint keynr, uchar *query, ...@@ -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, ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
sizeof(FTB_WORD *)*ftb->queue.elements); sizeof(FTB_WORD *)*ftb->queue.elements);
memcpy(ftb->list, ftb->queue.root+1, 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); (qsort2_cmp)FTB_WORD_cmp_list, ftb->charset);
if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC; if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
ftb->state=READY; ftb->state=READY;
......
storage/maria/ma_ft_nlq_search.c
View file @ be71f3cc
...@@ -295,7 +295,8 @@ FT_INFO *maria_ft_init_nlq_search(MARIA_HA *info, uint keynr, uchar *query, ...@@ -295,7 +295,8 @@ FT_INFO *maria_ft_init_nlq_search(MARIA_HA *info, uint keynr, uchar *query,
&dptr, left_root_right); &dptr, left_root_right);
if (flags & FT_SORTED) 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: err:
delete_tree(&aio.dtree); delete_tree(&aio.dtree);
......
storage/maria/ma_sort.c
View file @ be71f3cc
...@@ -653,7 +653,7 @@ static int write_keys(MARIA_SORT_PARAM *info, register uchar **sort_keys, ...@@ -653,7 +653,7 @@ static int write_keys(MARIA_SORT_PARAM *info, register uchar **sort_keys,
uint sort_length=info->key_length; uint sort_length=info->key_length;
DBUG_ENTER("write_keys"); 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); info);
if (!my_b_inited(tempfile) && if (!my_b_inited(tempfile) &&
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
...@@ -696,7 +696,7 @@ static int write_keys_varlen(MARIA_SORT_PARAM *info, ...@@ -696,7 +696,7 @@ static int write_keys_varlen(MARIA_SORT_PARAM *info,
int err; int err;
DBUG_ENTER("write_keys_varlen"); 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); info);
if (!my_b_inited(tempfile) && if (!my_b_inited(tempfile) &&
open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST",
...@@ -740,7 +740,7 @@ static int write_index(MARIA_SORT_PARAM *info, ...@@ -740,7 +740,7 @@ static int write_index(MARIA_SORT_PARAM *info,
{ {
DBUG_ENTER("write_index"); 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); (qsort2_cmp) info->key_cmp,info);
while (count--) while (count--)
{ {
......
storage/myisam/mi_check.c
View file @ be71f3cc
...@@ -1429,7 +1429,7 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info,int extend) ...@@ -1429,7 +1429,7 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info,int extend)
then recrate all indexes. 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; MYISAM_SHARE *share= info->s;
MI_STATE_INFO *state= &share->state; MI_STATE_INFO *state= &share->state;
...@@ -2671,14 +2671,14 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info, ...@@ -2671,14 +2671,14 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info,
/* /*
Quick repair (not touching data file, rebuilding indexes): 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): Non-quick repair (rebuilding data file and indexes):
{ {
Master thread: 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. Write cache is (MI_INFO *info)->rec_cache using new_file.
Slave threads: 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7