diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
| commit | 6286a05d80f9911b7cd6ba57b04a6f67d39e499d (patch) | |
| tree | 97a8a27c2d99a4474181e32602414d94944bfd80 /sql/log_event.cc | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| parent | 3c92050d1c907cc548e848d0ab2891a06681ad92 (diff) | |
| download | mariadb-git-6286a05d80f9911b7cd6ba57b04a6f67d39e499d.tar.gz | |
Merge 10.4 into 10.5
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 20cf4d45073..8bcdb3d6bae 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 @@ -1376,7 +1376,7 @@ static void copy_str_and_move(const char **src, } -#ifndef DBUG_OFF +#ifdef DBUG_TRACE static char const * code_name(int code) { |