diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 13:48:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 13:48:42 +0300 |
| commit | 44e64fd7e046b7cd480f8d269313081279c10a82 (patch) | |
| tree | 56ebc7ac7e2ed071dcfdbf5478d4e20ed6d93d44 /storage/innobase/pars | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| parent | 5633f83ca42ac6f035cf2c18ae11b3b7639b1f7e (diff) | |
| download | mariadb-git-44e64fd7e046b7cd480f8d269313081279c10a82.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/pars')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index 4c3343a60ae..363ca69a09b 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -2069,9 +2069,8 @@ pars_get_lex_chars( size_t max_size) /*!< in: maximum number of characters which fit in the buffer */ { - size_t len = size_t( - pars_sym_tab_global->string_len - - pars_sym_tab_global->next_char_pos); + size_t len = pars_sym_tab_global->string_len + - pars_sym_tab_global->next_char_pos; if (len == 0) { return(0); } @@ -2081,7 +2080,7 @@ pars_get_lex_chars( } 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); pars_sym_tab_global->next_char_pos += len; |