summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-26 16:06:08 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-26 16:06:08 +0100
commited4c100f767db1401e22ff786cd7121450e9677a (patch)
tree1fd788f35b4e62a98983a0117276e0893b6de514 /storage
parentb5a8d5d62bfe69e090840336aeb3f3b220a3d9a4 (diff)
downloadmariadb-git-ed4c100f767db1401e22ff786cd7121450e9677a.tar.gz
Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha_innodb.cc)
It needs recompilation for embedded server, as layout of THD is different in embedded.
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/CMakeLists.txt2
-rw-r--r--storage/xtradb/handler/handler0alter.cc1
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index 044a259c65d..1d2b0b29dea 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -266,4 +266,4 @@ IF(WITH_INNODB)
ENDIF()
MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE DEFAULT
- LINK_LIBRARIES ${ZLIB_LIBRARY})
+ LINK_LIBRARIES ${ZLIB_LIBRARY} RECOMPILE_FOR_EMBEDDED)
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
index 9d6ccaf99a2..2fd05901393 100644
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -23,6 +23,7 @@ Smart ALTER TABLE
#include <unireg.h>
#include <mysqld_error.h>
+#include <sql_class.h>
#include <sql_lex.h> // SQLCOM_CREATE_INDEX
#include <mysql/innodb_priv.h>