summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-04-25 11:06:16 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-04-25 11:06:16 -0400
commit4f1c1975b5f3d98321ad9e5b6f952c166d3606a7 (patch)
tree50c83e846f4a4d538b94bce41201d4a2847a852d /sql/handler.cc
parent9c89b84d46e0645820acb9e3cc339af10c68cfb7 (diff)
parent0991e19e9d38f7475390276c0557c2390e4d93c9 (diff)
downloadmariadb-git-4f1c1975b5f3d98321ad9e5b6f952c166d3606a7.tar.gz
Merge tag 'mariadb-5.5.49' into 5.5-galera
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 2337eaced55..970c177fee2 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2009, 2013, Monty Program Ab.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
+ Copyright (c) 2009, 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