diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-12-23 13:38:19 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-12-23 13:38:19 +0100 |
| commit | f62540ee25f23b89348068c01d6697714db276d7 (patch) | |
| tree | 1d2b96f8dc193f13c750f14171fe030980ee6440 | |
| parent | 8ec58ac0f4ecffea8f602e2275954935e9827cef (diff) | |
| download | mariadb-git-f62540ee25f23b89348068c01d6697714db276d7.tar.gz | |
Backport a fix from "trunk" into 5.5.1 which came after cloning only.
Original comment:
revno: 2930
| revision-id: alik@sun.com-20091223120351-m6l2t721tvtsiumu
| parent: alik@sun.com-20091223104155-cq3uw9l2yvg6jmgc
| committer: Alexander Nozdrin <alik@sun.com>
| branch nick: mysql-trunk-bugfixing
| timestamp: Wed 2009-12-23 15:03:51 +0300
| message:
| 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
| -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") |