diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-01-07 15:28:36 +0200 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-01-07 15:28:36 +0200 |
commit | 0bb9123f64e0cc63663b1e3cd0e44eaea1ed4721 (patch) | |
tree | d885b266e360e44a66cfa97fb5d2166a498eeb78 /sql/item_func.h | |
parent | 89d01ca087e80ffbb1d911f9b53eccbcbecd3a85 (diff) | |
parent | 7bd18b1a0d897732452f2dc45a698155dc7e6d6e (diff) | |
download | mariadb-git-0bb9123f64e0cc63663b1e3cd0e44eaea1ed4721.tar.gz |
automerge
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index ccab6c855c6..b36124691ed 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 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 |