summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-01-18 17:54:48 +0100
committerSergei Golubchik <serg@mariadb.org>2018-01-18 17:54:48 +0100
commit2d52d3c1bf46d2d5123ee986fff94858899cdf33 (patch)
tree31b0004b988f6169bd7f703a66f8ddc3189d332f /sql/unireg.cc
parent8aff418ec867419950bc2e0010f679b8f0216829 (diff)
parent946d9e4db4896992400cabbd0d1db9a0a10cbfd1 (diff)
downloadmariadb-git-2d52d3c1bf46d2d5123ee986fff94858899cdf33.tar.gz
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 2527d44bbd0..936203a78ab 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -1,5 +1,6 @@
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2018, 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