summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
diff options
context:
space:
mode:
authormmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
committermmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
commit49913f2a95d8dcb3ff05160f4c5bf22222bb5f26 (patch)
tree255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /sql/CMakeLists.txt
parent27d56afcfc5c7ccb7793d15f5643fcc058ceaa51 (diff)
parentba7b6e86f269ed5a634af13f422b92be3294431c (diff)
downloadmariadb-git-49913f2a95d8dcb3ff05160f4c5bf22222bb5f26.tar.gz
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
Diffstat (limited to 'sql/CMakeLists.txt')
-rwxr-xr-xsql/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 03b76e171e0..7e26f62b5f7 100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -40,6 +40,10 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc
ADD_DEFINITIONS(-DHAVE_INNOBASE -DMYSQL_SERVER
-D_CONSOLE -DHAVE_DLOPEN)
+
+IF(DISABLE_GRANT_OPTIONS)
+ ADD_DEFINITIONS(-DDISABLE_GRANT_OPTIONS)
+ENDIF(DISABLE_GRANT_OPTIONS)
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc