diff options
| author | monty@mysql.com <> | 2005-02-25 17:12:06 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-02-25 17:12:06 +0200 |
| commit | 7e5f74f8f2502361c9482f24d46aed5993018319 (patch) | |
| tree | 6fc367f3ae7c8968bf852d78cccec9f8c03ab417 /sql/log.cc | |
| parent | fe2a800423c96127987d4a9d6eb598bb5a2dca24 (diff) | |
| parent | 0a6b7aedb2cec716b98349765bfa369354787b25 (diff) | |
| download | mariadb-git-7e5f74f8f2502361c9482f24d46aed5993018319.tar.gz | |
Merge with global tree
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc index b37d053dfd7..56d16c9c7cf 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -608,7 +608,7 @@ bool MYSQL_LOG::open(const char *log_name, write_file_name_to_index_file= 1; } - DBUG_ASSERT(my_b_inited(&index_file)); + DBUG_ASSERT(my_b_inited(&index_file) != 0); reinit_io_cache(&index_file, WRITE_CACHE, my_b_filelength(&index_file), 0, 0); if (need_start_event && !no_auto_events) @@ -2461,7 +2461,7 @@ void sql_print_information(const char *format, ...) */ #define TC_LOG_HEADER_SIZE (sizeof(tc_log_magic)+1) -static const char tc_log_magic[]={254, 0x23, 0x05, 0x74}; +static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74}; uint opt_tc_log_size=TC_LOG_MIN_SIZE; ulong tc_log_max_pages_used=0, tc_log_page_size=0, @@ -2928,7 +2928,6 @@ int TC_LOG_BINLOG::open(const char *opt_name) { const char *errmsg; - char last_event_type=UNKNOWN_EVENT; IO_CACHE log; File file; Log_event *ev=0; |