summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-04-20 13:16:03 +0200
committerSergei Golubchik <serg@mariadb.org>2018-04-20 14:33:24 +0200
commit587568b72a0f4bcb284b292f158dea6f65c03487 (patch)
treee9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /sql/sql_admin.cc
parentbcb36ee21e2515d17dcf03b760487e64eb780f2b (diff)
parent51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff)
downloadmariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 6ba6f8a912e..06a453e1bb7 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates.
- Copyright (c) 2011, 2016, MariaDB
+ Copyright (c) 2011, 2018, 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