summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2021-12-13 12:04:59 +0300
committerNikita Malyavin <nikitamalyavin@gmail.com>2021-12-13 13:17:51 +0300
commite778793be3f7c2ca31cfb37eb3a89fe2851c39a2 (patch)
tree767a02d315efeb3dec9c090c59ee30e29f41ac70
parent91170497105bf822dc34f529bc6c5946725c1418 (diff)
downloadmariadb-git-e778793be3f7c2ca31cfb37eb3a89fe2851c39a2.tar.gz
fix windows build
-rw-r--r--sql/log.cc9
-rw-r--r--sql/log.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 32a8eb0aee9..26588acd4d1 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3637,15 +3637,16 @@ bool Event_log::open(const char *log_name,
if (error)
return error;
- int bytes_written= write_description_event(
+ longlong bytes_written= write_description_event(
(enum_binlog_checksum_alg)binlog_checksum_options,
encrypt_binlog, false);
error= bytes_written < 0;
return error;
}
-int Event_log::write_description_event(enum_binlog_checksum_alg checksum_alg,
- bool encrypt, bool dont_set_created)
+longlong
+Event_log::write_description_event(enum_binlog_checksum_alg checksum_alg,
+ bool encrypt, bool dont_set_created)
{
Format_description_log_event s(BINLOG_VERSION);
/*
@@ -3688,7 +3689,7 @@ int Event_log::write_description_event(enum_binlog_checksum_alg checksum_alg,
return -1;
}
}
- return s.data_written;
+ return (longlong)s.data_written;
}
diff --git a/sql/log.h b/sql/log.h
index c69b8bda2f2..b92be3a6149 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -426,8 +426,8 @@ public:
enum cache_type io_cache_type_arg);
virtual IO_CACHE *get_log_file() { return &log_file; }
- int write_description_event(enum_binlog_checksum_alg checksum_alg,
- bool encrypt, bool dont_set_created);
+ longlong write_description_event(enum_binlog_checksum_alg checksum_alg,
+ bool encrypt, bool dont_set_created);
bool write_event(Log_event *ev, binlog_cache_data *data, IO_CACHE *file);
};