diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-21 19:13:14 +0200 |
| commit | a8d03ab23519d4afc288a6490676ddb8745e3e72 (patch) | |
| tree | e55f53ff3cc4b044769ca269561a933e3c93f05f /win | |
| parent | 04f3ecf632816a940e2838949e0216d638436fd8 (diff) | |
| parent | 13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff) | |
| download | mariadb-git-a8d03ab23519d4afc288a6490676ddb8745e3e72.tar.gz | |
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.am | 3 | ||||
| -rw-r--r-- | win/build-vs10.bat | 2 | ||||
| -rw-r--r-- | win/build-vs10_x64.bat | 2 | ||||
| -rw-r--r-- | win/configure.js | 2 | ||||
| -rw-r--r-- | win/create_def_file.js | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index 7a27619eee3..e226f0bcbb3 100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006, 2007 MySQL AB, 2009 Sun Microsystems, Inc. +# Use is subject to license terms. # # 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/win/build-vs10.bat b/win/build-vs10.bat index c2bc09b17df..adda0651246 100644 --- a/win/build-vs10.bat +++ b/win/build-vs10.bat @@ -1,6 +1,6 @@ @echo off -REM Copyright (c) 2006,2010 Oracle and/or its affiliates. All rights reserved. +REM Copyright (c) 2011, Oracle and/or its affiliates REM REM This program is free software; you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by diff --git a/win/build-vs10_x64.bat b/win/build-vs10_x64.bat index 6fabe62a1ff..0d1424930fc 100644 --- a/win/build-vs10_x64.bat +++ b/win/build-vs10_x64.bat @@ -1,6 +1,6 @@ @echo off -REM Copyright (c) 2006,2010 Oracle and/or its affiliates. All rights reserved. +REM Copyright (c) 2011, Oracle and/or its affiliates REM REM This program is free software; you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by diff --git a/win/configure.js b/win/configure.js index 04659ef633a..c3e5429a620 100644 --- a/win/configure.js +++ b/win/configure.js @@ -1,6 +1,6 @@ // Configure.js // -// Copyright (C) 2006 MySQL AB +// Copyright (c) 2006, 2010, Oracle and/or its affiliates // // 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/win/create_def_file.js b/win/create_def_file.js index aaaf4659736..b6946ac85f1 100644 --- a/win/create_def_file.js +++ b/win/create_def_file.js @@ -1,6 +1,7 @@ // create_def_file.js // -// Copyright (C) 2009 Sun Microsystems +// Copyright (c) 2009 Sun Microsystems, Inc. +// Use is subject to license terms. // // 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 |