diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
commit | 2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f (patch) | |
tree | faaec8693d4aa4ba3a71c11a6143fc8d08d1fa95 /sql/log_event.cc | |
parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
download | mariadb-git-2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f.tar.gz |
Merge branch '10.7' into 10.8
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index de583eb0c10..b6ee77d6891 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB + Copyright (c) 2009, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1359,7 +1359,7 @@ static void copy_str_and_move(const char **src, Log_event::Byte **dst, } -#ifndef DBUG_OFF +#ifdef DBUG_TRACE static char const * code_name(int code) { |