diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
| commit | ae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (patch) | |
| tree | 4f2dee1467f3c3e3bd8feb6ffb7adf7684bdc653 /sql/CMakeLists.txt | |
| parent | 0c568a99dfe3e528ec5bd09dfe0f2f90acb52db4 (diff) | |
| parent | dacaaf22a3f132df5573fe8e58c0617c30c5e9fc (diff) | |
| download | mariadb-git-ae07ec6cbf08e311e538f5149f93385e5bcaa7a6.tar.gz | |
Merge with MYSQL 5.1.61
Fixed README with link to source
Merged InnoDB change to XtraDB
README:
Added information of where to find MariaDB code
storage/archive/ha_archive.cc:
Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 535f53335be..37c59a12541 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -64,6 +64,7 @@ SET (SQL_SOURCE sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc debug_sync.cc debug_sync.h + signal_handler.cc sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc @@ -112,7 +113,7 @@ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) ADD_CUSTOM_COMMAND(TARGET mysqld PRE_LINK COMMAND cscript ARGS //nologo ${PROJECT_SOURCE_DIR}/win/create_def_file.js ${PLATFORM} ${LIB_LOCATIONS} > mysqld.def - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/sql) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) ENDIF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) ADD_DEPENDENCIES(sql GenError) |