summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-03-22 14:41:36 +0400
committerAlexander Barkov <bar@mariadb.com>2019-03-22 14:41:36 +0400
commit1c60f40868f6067be81a50198e1c72df08814adf (patch)
treed5570ecfa377236d527d3c6a1db2a6b508c5a005 /sql/item_strfunc.h
parentf4484dfdbf2d78b0f357916ebd8ade024dd73c09 (diff)
parent50a8fc52988d13a5164a1a542b9d7a85e3ecc1c1 (diff)
downloadmariadb-git-1c60f40868f6067be81a50198e1c72df08814adf.tar.gz
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index a458ff53d11..56417f6d638 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -3,7 +3,7 @@
/*
Copyright (c) 2000, 2011, Oracle and/or its affiliates.
- Copyright (c) 2009, 2015, MariaDB
+ Copyright (c) 2009, 2019, 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