diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
| commit | 69204571425ed3221e94c7eb1e030c00089bca26 (patch) | |
| tree | 3d9cfbc44a057883c7db6bce267c8ebfd5fa9313 /client/mysql_upgrade.c | |
| parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
| parent | d26aefb0775048128495eaab151ee4118f8f7afd (diff) | |
| download | mariadb-git-69204571425ed3221e94c7eb1e030c00089bca26.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index b67ca5456d7..c6e54cba67b 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1,5 +1,7 @@ -/* Copyright (C) 2000 MySQL AB - Copyright (C) 2010 Monty Program Ab +/* + Copyright (C) 2000 MySQL AB + Copyright (c) 2006, 2011, Oracle and/or its affiliates. + Copyright (C) 2010-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 @@ -12,7 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "client_priv.h" #include <sslopt-vars.h> |