diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:25:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:25:14 +0200 |
| commit | 74d648db12e100c628548fb2e5aa67de718bd1fb (patch) | |
| tree | 4a55d0587179de8577c772c14328c9d5cd6197b4 /sql | |
| parent | 4fbf86454f62f1a7859ca4c6ef4fd3002a3c9881 (diff) | |
| download | mariadb-git-74d648db12e100c628548fb2e5aa67de718bd1fb.tar.gz | |
Make a size_t-to-uint conversion explicit
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 599694b01ef..1352bb64be8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2017, MariaDB Corporation. + Copyright (c) 2008, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4299,7 +4299,7 @@ static int init_common_variables() if (IS_SYSVAR_AUTOSIZE(&server_version_ptr)) set_server_version(server_version, sizeof(server_version)); - mysql_real_data_home_len= strlen(mysql_real_data_home); + mysql_real_data_home_len= uint(strlen(mysql_real_data_home)); if (!opt_abort) { |