diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 21:03:01 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 21:03:01 +0100 |
commit | 5d0c01608c74b09fea8c6110213160b049487a4c (patch) | |
tree | 924e11e71f586c97a20f43d66183393ea1f48504 /sql/item_strfunc.cc | |
parent | cfc83cf9d3c3354d47f9e7ee903ea279f60cce58 (diff) | |
parent | e772cbd7b774add42821c33b13ea052f8c9e2e6e (diff) | |
download | mariadb-git-5d0c01608c74b09fea8c6110213160b049487a4c.tar.gz |
5.2 merge
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 497739f112a..d00eb8002f2 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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 |