mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge 10.4 into 10.5
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user