diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
commit | 53aabda6b5ac6af989a97a00ff97efda9ff8772e (patch) | |
tree | 95867fd8cf7284dd7b2da1882182ceedffbbe683 /sql/select_handler.cc | |
parent | f614b6ea6112c219581ffc35e753bc1dab48483a (diff) | |
parent | ba679ae52f0e9d698c1b36d28a5bc8c233e57a2e (diff) | |
download | mariadb-git-53aabda6b5ac6af989a97a00ff97efda9ff8772e.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/select_handler.cc')
-rw-r--r-- | sql/select_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/select_handler.cc b/sql/select_handler.cc index 4d2cacd1a6e..9a2f6398a86 100644 --- a/sql/select_handler.cc +++ b/sql/select_handler.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2018, 2019 MariaDB + Copyright (c) 2018, 2020, 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 |