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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 438d859d3ae..7c1bfeee0b4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (C) 2006-2009 MySQL AB & Monty Program Ab +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. +# Copyright (c) 2008-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 |