diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
commit | 5c81e2cf16a0df230c9a17b1c93cdf656d5e7523 (patch) | |
tree | 94f7517b9264a7af5ea2dd14b146c7e10860363b /libmysql | |
parent | 0e2adc4ae6d3080b5c457bf5fd47d30e54298149 (diff) | |
parent | 2585da55ac33a90652573dc11188c77d43e26ca4 (diff) | |
download | mariadb-git-5c81e2cf16a0df230c9a17b1c93cdf656d5e7523.tar.gz |
merged mysql-5.5 into WL1054-5.5
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index f5fa1f7a009..7441423743e 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006, 2010, 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 @@ -11,7 +11,7 @@ # # 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include |