summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-07-05 11:41:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-07-05 14:14:31 +0300
commite9f1d8da57ba9329289c3448223cc86a13a5d918 (patch)
tree9f7866f4a4199adb6d95b3621e7ed6106df12749
parent058554027f6696775ca1b289688956606f59ce7d (diff)
downloadmariadb-git-e9f1d8da57ba9329289c3448223cc86a13a5d918.tar.gz
Fix warnings about possibly uninitialized variables
-rw-r--r--storage/innobase/buf/buf0flu.cc3
-rw-r--r--storage/innobase/dict/dict0dict.cc1
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 99a36fc3c45..cf53a10fa21 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -965,7 +965,7 @@ buf_flush_init_for_writing(
}
}
- uint32_t checksum;
+ uint32_t checksum = BUF_NO_CHECKSUM_MAGIC;
switch (srv_checksum_algorithm_t(srv_checksum_algorithm)) {
case SRV_CHECKSUM_ALGORITHM_INNODB:
@@ -988,7 +988,6 @@ buf_flush_init_for_writing(
break;
case SRV_CHECKSUM_ALGORITHM_NONE:
case SRV_CHECKSUM_ALGORITHM_STRICT_NONE:
- checksum = BUF_NO_CHECKSUM_MAGIC;
mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM,
checksum);
break;
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index df5c678ffb5..c4b88cbea56 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -6981,6 +6981,7 @@ dict_foreign_qualify_index(
}
if (dict_col_is_virtual(field->col)) {
+ col_name = "";
for (ulint j = 0; j < table->n_v_def; j++) {
col_name = dict_table_get_v_col_name(table, j);
if (innobase_strcasecmp(field->name,col_name) == 0) {