diff options
| author | Daniel Black <danielgb@au.ibm.com> | 2018-02-25 15:25:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 15:25:54 +1100 |
| commit | 0805a9565f09a36104a420d9e229e44b1eea8879 (patch) | |
| tree | 5c5dbf942479c2b7349f1b4505768ddf5a2f8b8d /sql/sql_digest.cc | |
| parent | 3188131b15c26509e4df3c4b15972d07a20be8bd (diff) | |
| parent | 8936b175106a3fdfc560e9d33aa58a6372084c5f (diff) | |
| download | mariadb-git-0805a9565f09a36104a420d9e229e44b1eea8879.tar.gz | |
Merge branch '10.3' into 10.2-MDEV-10814-dont-dump-query-cache
Diffstat (limited to 'sql/sql_digest.cc')
| -rw-r--r-- | sql/sql_digest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_digest.cc b/sql/sql_digest.cc index 65edcc122f1..54ed1c3f225 100644 --- a/sql/sql_digest.cc +++ b/sql/sql_digest.cc @@ -20,7 +20,7 @@ #include "mariadb.h" #include "my_md5.h" -#include "mysqld_error.h" +#include "unireg.h" #include "sql_string.h" #include "sql_class.h" @@ -149,7 +149,7 @@ inline void store_token_identifier(sql_digest_storage* digest_storage, /* Write the string data */ if (id_length > 0) memcpy((char *)(dest + 4), id_name, id_length); - digest_storage->m_byte_count+= bytes_needed; + digest_storage->m_byte_count+= (uint)bytes_needed; } else { |