summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-05 18:10:20 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-05 18:10:20 +0200
commit2391f09645c62fe4a4e440a986e17d7da9580eeb (patch)
treede567af17defc412ed072797f882a3db0932209e /strings
parent299b7a97956f9572da0194bc99dae836c0a2e080 (diff)
parent12fcb9f6e5d6bad3e05ffb599497980cc01fdf7e (diff)
downloadmariadb-git-2391f09645c62fe4a4e440a986e17d7da9580eeb.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'strings')
-rw-r--r--strings/conf_to_src.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index dc2a300a2ec..7e742050aa8 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -249,7 +249,7 @@ static void
fprint_copyright(FILE *file)
{
fprintf(file,
-"/* Copyright (C) 2000-2007 MySQL AB\n"
+"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
"\n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"