summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0row.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/row/row0row.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/row/row0row.cc')
-rw-r--r--storage/innobase/row/row0row.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc
index 2664f8a3d9e..30b0a7a360c 100644
--- a/storage/innobase/row/row0row.cc
+++ b/storage/innobase/row/row0row.cc
@@ -1014,7 +1014,7 @@ row_search_on_row_ref(
index = dict_table_get_first_index(table);
- if (UNIV_UNLIKELY(ref->info_bits)) {
+ if (UNIV_UNLIKELY(ref->info_bits != 0)) {
ut_ad(ref->info_bits == REC_INFO_DEFAULT_ROW);
ut_ad(ref->n_fields <= index->n_uniq);
btr_pcur_open_at_index_side(true, index, mode, pcur, true, 0,
@@ -1186,7 +1186,7 @@ row_raw_format_int(
value = mach_read_int_type(
(const byte*) data, data_len, unsigned_type);
- ret = snprintf(
+ ret = (ulint) snprintf(
buf, buf_size,
unsigned_type ? "%llu" : "%lld", (longlong) value)+1;
} else {