diff options
author | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
---|---|---|
committer | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
commit | 4acfdb9df152737cc87cc205ee8d8d962c2486b7 (patch) | |
tree | f61328771628e2b6b67f40d38e0a493c5ba4e6f7 /sql/gen_lex_hash.cc | |
parent | bc56dcea9d7047c5561cee08ec2d74077e329f7d (diff) | |
parent | 85323eda8a5823e4db1fa34dc998684b67e710b5 (diff) | |
download | mariadb-git-4acfdb9df152737cc87cc205ee8d8d962c2486b7.tar.gz |
Merge
Diffstat (limited to 'sql/gen_lex_hash.cc')
-rw-r--r-- | sql/gen_lex_hash.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index 5a0904f87b9..e8a83b34d9d 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (C) 2000-2007 MySQL AB, 2009 Sun Microsystems, Inc. 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 @@ -451,7 +451,7 @@ int main(int argc,char **argv) printf("/*\n\n Do " "not " "edit " "this " "file " "directly!\n\n*/\n"); printf("\ -/* Copyright 2001-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n\ +/* Copyright (C) 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\ |