diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-19 17:45:17 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 17:20:46 +0000 |
| commit | eba44874ca9fc317696630cb371623142289fa99 (patch) | |
| tree | f67cd5dbcaf102abef2fb26f76357d14feaded04 /sql/gen_lex_token.cc | |
| parent | de7c2e5e545df90fc9814c60a8a5a8d20f22b2c3 (diff) | |
| download | mariadb-git-eba44874ca9fc317696630cb371623142289fa99.tar.gz | |
MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.
- Fix win64 pointer truncation warnings
(usually coming from misusing 0x%lx and long cast in DBUG)
- Also fix printf-format warnings
Make the above mentioned warnings fatal.
- fix pthread_join on Windows to set return value.
Diffstat (limited to 'sql/gen_lex_token.cc')
| -rw-r--r-- | sql/gen_lex_token.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc index eefe9163819..bd2b9728177 100644 --- a/sql/gen_lex_token.cc +++ b/sql/gen_lex_token.cc @@ -79,7 +79,7 @@ void set_token(int tok, const char *str) } compiled_token_array[tok].m_token_string= str; - compiled_token_array[tok].m_token_length= strlen(str); + compiled_token_array[tok].m_token_length= (int)strlen(str); compiled_token_array[tok].m_append_space= true; compiled_token_array[tok].m_start_expr= false; } |