diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /sql/sql_parse.cc | |
parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a6574479e8d..e059be4860b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2015, MariaDB +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. + Copyright (c) 2008, 2017, 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 |