summaryrefslogtreecommitdiff
path: root/include/mysql/psi/mysql_socket.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-02-03 17:01:31 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-02-03 17:01:31 +0100
commitf5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch)
tree8a46fbd9dfd51352800ea606ae52a53ceb239501 /include/mysql/psi/mysql_socket.h
parent8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff)
parentcf63eecef44f189ce2d221612dee9dfc1885ba4e (diff)
downloadmariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz
Merge branch '10.5' into 10.6
Diffstat (limited to 'include/mysql/psi/mysql_socket.h')
-rw-r--r--include/mysql/psi/mysql_socket.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index d70e1c8fc5a..4f1b48aa9a4 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify