diff options
| author | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
|---|---|---|
| committer | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
| commit | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (patch) | |
| tree | 255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /sql/CMakeLists.txt | |
| parent | c11c3b08b8354836a5b1073b122f68ef0dc117f6 (diff) | |
| parent | a4817aced500feede54a9548b650650e513b69d9 (diff) | |
| download | mariadb-git-50361d9a44ddce3d0253feba9c658a17b2b0a517.tar.gz | |
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
configure.in:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysqld.cc:
Auto merged
win/configure.js:
Auto merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 4 |
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 |