diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-10 11:32:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-12-10 11:32:49 +0200 |
| commit | 26fdbd7632caa6299c01504a4d35634e91eb1802 (patch) | |
| tree | a64aaa6c7290f50615190ec1fa5c572bd9638374 | |
| parent | f502ae82268d71f0a530ec0a464d6a6138bccc59 (diff) | |
| parent | 50ed0bd891f11a2dae3a67d1ecbf8223fcbedbc6 (diff) | |
| download | mariadb-git-26fdbd7632caa6299c01504a4d35634e91eb1802.tar.gz | |
Merge 10.6 into 10.7
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 6694648bc5b..20ab06c8461 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -767,7 +767,7 @@ dict_sys_tables_rec_read( " data dictionary contains invalid flags." " SYS_TABLES.TYPE=" UINT32PF " SYS_TABLES.N_COLS=" UINT32PF, - name.size(), name.data(), type, *n_cols); + int(name.size()), name.data(), type, *n_cols); return(false); } @@ -792,7 +792,7 @@ dict_sys_tables_rec_read( " contains invalid flags." " SYS_TABLES.TYPE=" UINT32PF " SYS_TABLES.MIX_LEN=" UINT32PF, - name.size(), name.data(), + int(name.size()), name.data(), type, *flags2); return(false); } @@ -2246,7 +2246,7 @@ static dict_table_t *dict_load_table_one(const span<const char> &name, DBUG_ENTER("dict_load_table_one"); DBUG_PRINT("dict_load_table_one", - ("table: %.*s", name.size(), name.data())); + ("table: %.*s", int(name.size()), name.data())); ut_ad(dict_sys.locked()); |