From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 25 Apr 2011 17:22:25 +0200
Subject: lots of post-merge changes

---
 cmake/plugin.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake')

diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 138901dfa8a..31e1fceec23 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -135,11 +135,11 @@ MACRO(MYSQL_ADD_PLUGIN)
 
     IF(ARG_MANDATORY)
       SET (mysql_mandatory_plugins  
-        "${mysql_mandatory_plugins} builtin_${target}_plugin," 
+        "${mysql_mandatory_plugins} builtin_maria_${target}_plugin," 
       PARENT_SCOPE)
     ELSE()
       SET (mysql_optional_plugins  
-        "${mysql_optional_plugins} builtin_${target}_plugin,"
+        "${mysql_optional_plugins} builtin_maria_${target}_plugin,"
       PARENT_SCOPE)
     ENDIF()
   ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY  AND NOT WITHOUT_DYNAMIC_PLUGINS)
-- 
cgit v1.2.1