diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
commit | cbd52a42ee9b93675e5cdaa043df878c423b6571 (patch) | |
tree | f7159b893a8dc1d5efd540ef2b3b21227aaf2b6d /scripts | |
parent | 70a3cafe4d1aa28e1b6c36d9001bc0d487262976 (diff) | |
parent | dea3544b2d9bd68961b8e84c3772deda435f15b5 (diff) | |
download | mariadb-git-cbd52a42ee9b93675e5cdaa043df878c423b6571.tar.gz |
merge
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_install_db.pl.in | 2 | ||||
-rw-r--r-- | scripts/mysql_install_db.sh | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 83756d686d2..e20dc43867f 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- # -# Copyright (C) 2007 MySQL AB +# Copyright (c) 2007, 2011, 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 diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index dfea57fad26..d2e63cd6c1e 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -1,7 +1,6 @@ #!/bin/sh -# Copyright (c) 2000-2008 MySQL AB, 2009, 2010 Sun Microsystems, Inc. -# Copyright (c) 2009-2011 Monty Program Ab -# Use is subject to license terms. +# 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 |