diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-23 15:03:51 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-23 15:03:51 +0300 |
| commit | ba60b39ca3678a2ec53d773144662b2ed2f11f64 (patch) | |
| tree | b8cbc9e436b4123c3974364698338b48351a8c5a /storage | |
| parent | a987a27dc76aed5f1aceb2322a470fa7ffca3c72 (diff) | |
| download | mariadb-git-ba60b39ca3678a2ec53d773144662b2ed2f11f64.tar.gz | |
Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
into mysql-trunk-bugfixing.
Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
------------------------------------------------------------
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 3f9808a2022..b63ed840f3c 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -86,5 +86,10 @@ IF (MYSQL_VERSION_ID GREATER "50137") SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb) ENDIF(LIB_LOCATION) ELSE (MYSQL_VERSION_ID GREATER "50137") - MYSQL_STORAGE_ENGINE(INNODB_PLUGIN) + IF (NOT SOURCE_SUBLIBS) + ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER) + ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES}) + # Require mysqld_error.h, which is built as part of the GenError + ADD_DEPENDENCIES(innobase GenError) + ENDIF (NOT SOURCE_SUBLIBS) ENDIF (MYSQL_VERSION_ID GREATER "50137") |