Skip to content

Commit 967e9e1

Browse files
dr-mdr-m
committed
Merge mariadb-10.9.6 into 10.9
2 parents 56aa73a + 3476240 commit 967e9e1

File tree

389 files changed

+3695
-954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+3695
-954
lines changed

‎debian/autobake-deb.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ remove_rocksdb_tools()
5959
replace_uring_with_aio()
6060
{
6161
sed 's/liburing-dev/libaio-dev/g' -i debian/control
62-
sed -e '/-DIGNORE_AIO_CHECK=YES/d' \
63-
-e '/-DWITH_URING=YES/d' -i debian/rules
62+
sed -e '/-DIGNORE_AIO_CHECK=ON/d' \
63+
-e '/-DWITH_URING=ON/d' -i debian/rules
6464
}
6565

6666
disable_pmem()

‎include/mysql/psi/mysql_file.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2008, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_idle.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates
1+
/* Copyright (c) 2011, 2023, Oracle and/or its affiliates
22
Copyright (c) 2017, 2019, MariaDB Corporation.
33
44
This program is free software; you can redistribute it and/or modify

‎include/mysql/psi/mysql_mdl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_memory.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2012, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_ps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2014, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_socket.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
22
Copyright (c) 2017, MariaDB Corporation.
33
44
This program is free software; you can redistribute it and/or modify

‎include/mysql/psi/mysql_sp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2013, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_stage.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,

‎include/mysql/psi/mysql_statement.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
1+
/* Copyright (c) 2010, 2023, Oracle and/or its affiliates.
22
Copyright (c) 2017, 2019, MariaDB Corporation.
33
44
This program is free software; you can redistribute it and/or modify

0 commit comments

Comments
 (0)