summaryrefslogtreecommitdiff
path: root/sql/item_xmlfunc.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-26 07:03:39 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-26 07:03:39 +0200
commitcf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b (patch)
tree0e9c8d48fda7b7494b5d3b220bc6af64e4f3e64a /sql/item_xmlfunc.cc
parentfc77a66c7eb1b8e90753814aa567daeaabd0dd90 (diff)
parent584d213235704113cf0d70319c0521d93b8744c6 (diff)
downloadmariadb-git-cf8c2a3c3b2eb05df419ce014b98a71b1e75ad6b.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_xmlfunc.cc')
-rw-r--r--sql/item_xmlfunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 7fa9f6a8c22..0e62e29bfe2 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2005, 2016, Oracle and/or its affiliates.
- Copyright (c) 2009, 2017, MariaDB
+/* Copyright (c) 2005, 2019, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2019, 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