summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-08-16 10:46:21 +0400
committerAlexander Nozdrin <alik@sun.com>2010-08-16 10:46:21 +0400
commit98f69947aaf8680fa31a01f0da60be64cb9348e5 (patch)
tree7ae25fb68988704b083ecd1c2f3f58efc97f4672 /storage/myisam
parent427efc3a402af5fe4d57fc5468a27278d95fcda6 (diff)
parent32edab6bfe4fada3adbf8688375600c8f911c82c (diff)
downloadmariadb-git-98f69947aaf8680fa31a01f0da60be64cb9348e5.tar.gz
Auto-merge from mysql-5.5.
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index b057a62a6dd..487fbded2df 100644
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/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
SET(MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
ha_myisam.cc