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/eval | |
| 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/eval')
| -rw-r--r-- | storage/innobase/eval/eval0eval.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/eval/eval0eval.cc b/storage/innobase/eval/eval0eval.cc index fa0b265b3db..6cc63b3a004 100644 --- a/storage/innobase/eval/eval0eval.cc +++ b/storage/innobase/eval/eval0eval.cc @@ -585,7 +585,7 @@ eval_instr( /* We have already matched j characters */ if (j == len2) { - int_val = i + 1; + int_val = lint(i) + 1; goto match_found; } @@ -781,7 +781,7 @@ eval_predefined( } /* allocate the string */ - data = eval_node_ensure_val_buf(func_node, int_len + 1); + data = eval_node_ensure_val_buf(func_node, ulint(int_len) + 1); /* add terminating NUL character */ data[int_len] = 0; @@ -804,7 +804,7 @@ eval_predefined( } } - dfield_set_len(que_node_get_val(func_node), int_len); + dfield_set_len(que_node_get_val(func_node), ulint(int_len)); return; @@ -833,12 +833,11 @@ eval_func( { que_node_t* arg; ulint fclass; - ulint func; ut_ad(que_node_get_type(func_node) == QUE_NODE_FUNC); fclass = func_node->fclass; - func = func_node->func; + const int func = func_node->func; arg = func_node->args; |