summaryrefslogtreecommitdiff
path: root/storage/innobase/dict/dict0load.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-28 15:49:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-28 20:45:45 +0300
commitba19764209dc2e2cb0a688cada02e15720d9242b (patch)
treeb7b4f6512f0dc40ba2403de663f1955ba1847bfb /storage/innobase/dict/dict0load.cc
parente37df0f95a3b216c8cdecb5cacb360037dc631c3 (diff)
downloadmariadb-git-ba19764209dc2e2cb0a688cada02e15720d9242b.tar.gz
Fix most -Wsign-conversion in InnoDB
Change innodb_buffer_pool_size, innodb_fill_factor to unsigned.
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
-rw-r--r--storage/innobase/dict/dict0load.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index b45720a3313..bae4bb7d49c 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1138,7 +1138,7 @@ dict_sys_tables_type_valid(ulint type, bool not_redundant)
if (!not_redundant) {
/* SYS_TABLES.TYPE must be 1 or 1|DICT_TF_MASK_NO_ROLLBACK
for ROW_FORMAT=REDUNDANT. */
- return !(type & ~(1 | DICT_TF_MASK_NO_ROLLBACK));
+ return !(type & ~(1U | DICT_TF_MASK_NO_ROLLBACK));
}
if (type >= 1U << DICT_TF_POS_UNUSED) {
@@ -2032,7 +2032,7 @@ dict_load_field_low(
ulint len;
unsigned pos_and_prefix_len;
unsigned prefix_len;
- ibool first_field;
+ bool first_field;
ulint position;
/* Either index or sys_field is supplied, not both */