diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
| commit | 6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b (patch) | |
| tree | 79e3143528495069ad232f673532573b30afe425 /win | |
| parent | 3e2cb35e11cb5ee6668d538a62a3b32e017944a5 (diff) | |
| parent | 701c0f822abe4ee9eeafd244fa30dc2fcf067b81 (diff) | |
| download | mariadb-git-6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b.tar.gz | |
Merge with 5.2.
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.am | 3 | ||||
| -rw-r--r-- | win/configure.js | 2 | ||||
| -rw-r--r-- | win/create_def_file.js | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index 310c54bc117..6f2b92fb5bf 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/configure.js b/win/configure.js index 43234b39c22..7e2cb3cd3d9 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 |