summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-21 00:24:42 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-21 00:24:42 +0400
commite30e0325a23ac127057c9e47445254cd10def74d (patch)
tree734e4ce952db72a410f0dbd0e5c7f9780eb7ce80 /storage
parent5c4cb505ef342384812b0368048a4590fd7331b5 (diff)
parent78dde957e96bb862f217cedda9e8f076c7a94fb7 (diff)
downloadmariadb-git-e30e0325a23ac127057c9e47445254cd10def74d.tar.gz
Merge from mysql-trunk-merge.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/CMakeLists.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 2dfd19ef06c..57ad7f4b28c 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -100,4 +100,3 @@ ELSE (MYSQL_VERSION_ID GREATER "50137")
ADD_DEPENDENCIES(innobase GenError)
ENDIF (NOT SOURCE_SUBLIBS)
ENDIF (MYSQL_VERSION_ID GREATER "50137")
-MYSQL_STORAGE_ENGINE(INNOBASE)