summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-06-24 12:01:22 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-06-24 12:01:22 -0400
commit14d62505d90f01eb6d81466c1d69fa38523c4d3e (patch)
tree98e08ad71dd605fdfbad22080be969ecae6747ce /sql/sql_reload.cc
parent868c2ceb013e06c29ba37d4634f2d543b96539aa (diff)
parent9fc102b37ec45bf5a1010a9f660137304de482bc (diff)
downloadmariadb-git-14d62505d90f01eb6d81466c1d69fa38523c4d3e.tar.gz
Merge tag 'mariadb-10.0.26' into 10.0-galera
Diffstat (limited to 'sql/sql_reload.cc')
-rw-r--r--sql/sql_reload.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 4629154de7d..f8c04af56bb 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -1,4 +1,5 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2016, Oracle and/or its affiliates.
+ Copyright (c) 2011, 2016, 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