diff --git a/plugin/query_response_time/mysql-test/query_response_time/session_toggle.result b/plugin/query_response_time/mysql-test/query_response_time/session_toggle.result
index 0707db1c0fa..7ee21c91405 100644
--- a/plugin/query_response_time/mysql-test/query_response_time/session_toggle.result
+++ b/plugin/query_response_time/mysql-test/query_response_time/session_toggle.result
@@ -4,6 +4,8 @@
 SET @saved_query_response_time_stats = @@GLOBAL.query_response_time_stats;
 SET @saved_query_response_time_flush = @@GLOBAL.query_response_time_flush;
 SET GLOBAL query_response_time_flush= 'ON';
+Warnings:
+Warning	1287	'@@query_response_time_flush' is deprecated and will be removed in a future release
 SELECT SUM(COUNT),1 FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME;
 SUM(COUNT)	1
 0	1
@@ -123,4 +125,6 @@ disconnect con3;
 connection default;
 # Cleanup
 SET GLOBAL query_response_time_flush = @saved_query_response_time_flush;
+Warnings:
+Warning	1287	'@@query_response_time_flush' is deprecated and will be removed in a future release
 SET GLOBAL query_response_time_stats = @saved_query_response_time_stats;
diff --git a/plugin/query_response_time/plugin.cc b/plugin/query_response_time/plugin.cc
index 877fc09e5a2..c528648f187 100644
--- a/plugin/query_response_time/plugin.cc
+++ b/plugin/query_response_time/plugin.cc
@@ -1,5 +1,5 @@
 /* Copyright (C) 2013 Percona and Sergey Vojtovich
-   Copyright (C) 2023 MariaDB Foundation
+   Copyright (C) 2024 MariaDB Foundation
 
    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
@@ -61,10 +61,10 @@ static MYSQL_SYSVAR_BOOL(stats, opt_query_response_time_stats,
        "Enable or disable query response time statistics collecting",
        NULL, NULL, FALSE);
 static MYSQL_SYSVAR_BOOL(flush, opt_query_response_time_flush,
-       PLUGIN_VAR_NOCMDOPT,
+       PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_DEPRECATED,
        "Update of this variable flushes statistics and re-reads "
-       "query_response_time_range_base. Deprecated. "
-       "Use \"FLUSH query_response_time\" instead",
+       "query_response_time_range_base. Compatibility variable, "
+       "use FLUSH QUERY_RESPONSE_TIME instead",
        NULL, query_response_time_flush_update, FALSE);
 #ifndef DBUG_OFF
 static MYSQL_THDVAR_ULONGLONG(exec_time_debug, PLUGIN_VAR_NOCMDOPT,
diff --git a/sql/handler.cc b/sql/handler.cc
index 277c12d2767..5eb6724926c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2023, MariaDB Corporation.
+   Copyright (c) 2009, 2024, MariaDB Corporation.
 
    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
diff --git a/sql/log.cc b/sql/log.cc
index af01c034d43..b6a8964ee25 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2018, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2022, MariaDB Corporation.
+   Copyright (c) 2009, 2024, MariaDB Corporation.
 
    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
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 705be54c925..546f7b8b7bb 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2002, 2016, Oracle and/or its affiliates.
-   Copyright (c) 2011, 2020, MariaDB
+   Copyright (c) 2011, 2024, 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
diff --git a/sql/sp_instr.cc b/sql/sp_instr.cc
index 266e3d3184d..1d939733ba3 100644
--- a/sql/sp_instr.cc
+++ b/sql/sp_instr.cc
@@ -1,3 +1,20 @@
+/*
+   Copyright (c) 2002, 2016, Oracle and/or its affiliates.
+   Copyright (c) 2011, 2024, 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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
 #include "sp_instr.h"
 
 #include "opt_trace.h"    // class Opt_trace_start
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index b69bdf03515..2ffd666a6e4 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
-   Copyright (c) 2010, 2022, MariaDB
+   Copyright (c) 2010, 2024, 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
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 757133d7767..559a6c68f82 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2000, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2008, 2022, MariaDB Corporation.
+   Copyright (c) 2008, 2024, MariaDB Corporation.
 
    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
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 8c8b7bd58a5..6e118d59dcc 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1,5 +1,6 @@
 /*
-   Copyright (c) 2009, 2022, MariaDB Corporation.
+   Copyright (c) 2000, 2016, Oracle and/or its affiliates.
+   Copyright (c) 2009, 2024, MariaDB Corporation.
 
    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
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a50a417deb6..e4ad364a251 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
-   Copyright (c) 2008, 2023, MariaDB
+   Copyright (c) 2008, 2024, 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
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b820f7cd3e2..b964edb11f4 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2022, MariaDB Corporation.
+   Copyright (c) 2009, 2024, MariaDB Corporation.
 
    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