diff options
author | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
commit | 90e058e0c623f770ee602ebab86e91303f08c90a (patch) | |
tree | 33aa211800a7c5a746eb4cd1077a06ab8b549642 /strings/my_vsnprintf.c | |
parent | 8b046db411b963f48b06716fab764a35456c43d7 (diff) | |
parent | ee1950dab11b3b36ca61930c1733ccc4c721f21a (diff) | |
download | mariadb-git-90e058e0c623f770ee602ebab86e91303f08c90a.tar.gz |
Automatic merge
Diffstat (limited to 'strings/my_vsnprintf.c')
-rw-r--r-- | strings/my_vsnprintf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index a39cfb7083a..b9cfcf134e4 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2009-2011, Monty Program Ab 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 |