diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-28 15:49:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-28 20:45:45 +0300 |
| commit | ba19764209dc2e2cb0a688cada02e15720d9242b (patch) | |
| tree | b7b4f6512f0dc40ba2403de663f1955ba1847bfb /storage/innobase/pars | |
| parent | e37df0f95a3b216c8cdecb5cacb360037dc631c3 (diff) | |
| download | mariadb-git-ba19764209dc2e2cb0a688cada02e15720d9242b.tar.gz | |
Fix most -Wsign-conversion in InnoDB
Change innodb_buffer_pool_size, innodb_fill_factor to unsigned.
Diffstat (limited to 'storage/innobase/pars')
| -rw-r--r-- | storage/innobase/pars/pars0opt.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc index bbc8eec0774..0d60dc7bade 100644 --- a/storage/innobase/pars/pars0opt.cc +++ b/storage/innobase/pars/pars0opt.cc @@ -206,7 +206,7 @@ opt_look_for_col_in_comparison_before( if (opt_check_exp_determined_before(exp, sel_node, nth_table)) { - *op = search_cond->func; + *op = ulint(search_cond->func); return(exp); } @@ -225,7 +225,8 @@ opt_look_for_col_in_comparison_before( if (opt_check_exp_determined_before(exp, sel_node, nth_table)) { - *op = opt_invert_cmp_op(search_cond->func); + *op = ulint(opt_invert_cmp_op( + search_cond->func)); return(exp); } diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index fbe55d1df03..8a30e611eb4 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1832,7 +1832,7 @@ pars_column_def( ulint len2; if (len) { - len2 = eval_node_get_int_val(len); + len2 = ulint(eval_node_get_int_val(len)); } else { len2 = 0; } @@ -2074,9 +2074,8 @@ pars_get_lex_chars( { int len; - len = static_cast<int>( - pars_sym_tab_global->string_len - - pars_sym_tab_global->next_char_pos); + len = int(pars_sym_tab_global->string_len) + - pars_sym_tab_global->next_char_pos; if (len == 0) { return(0); } @@ -2085,8 +2084,8 @@ pars_get_lex_chars( len = max_size; } - ut_memcpy(buf, pars_sym_tab_global->sql_string - + pars_sym_tab_global->next_char_pos, len); + memcpy(buf, pars_sym_tab_global->sql_string + + pars_sym_tab_global->next_char_pos, ulint(len)); pars_sym_tab_global->next_char_pos += len; @@ -2345,7 +2344,7 @@ pars_info_add_int4_literal( /*=======================*/ pars_info_t* info, /*!< in: info struct */ const char* name, /*!< in: name */ - lint val) /*!< in: value */ + ulint val) /*!< in: value */ { byte* buf = static_cast<byte*>(mem_heap_alloc(info->heap, 4)); |