PBXT

Merge lp:~vkolesnikov/pbxt/pbxt-mysql-tree-dropin into lp:pbxt

  1. pbxt-mysql-tree-dropin
  2. Merge into trunk
Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-mysql-tree-dropin
Merge into: lp:pbxt
Diff against target: None lines
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-mysql-tree-dropin
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+11963@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vladimir Kolesnikov (vkolesnikov) wrote :

With these changes one can simply put pbxt directory under <mysql-root>/storage and build PBXT engine as a part of source tree. The engine will be linked statically. Be sure to specify the WITH_PBXT_STORAGE_ENGINE option when running win\configure.js

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'CMakeLists.txt'
--- CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ CMakeLists.txt 2009-09-17 10:59:05 +0000
@@ -0,0 +1,104 @@
1# Copyright (c) 2008 PrimeBase Technologies GmbH
2#
3# PrimeBase XT
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2 of the License, or
8# (at your option) any later version.
9#
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with this program; if not, write to the Free Software
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18#
19# 2006-03-22 Paul McCullagh
20#
21# H&G2JCtL
22#
23# This file is used to make the Windows version
24
25SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQL_SERVER")
26SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMYSQL_SERVER")
27
28SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
29SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
30
31INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
32 ${CMAKE_SOURCE_DIR}/regex
33 ${CMAKE_SOURCE_DIR}/extra/yassl/include)
34
35SET(PBXT_SOURCES src/backup_xt.cc
36src/backup_xt.h
37src/bsearch_xt.cc
38src/bsearch_xt.h
39src/cache_xt.cc
40src/cache_xt.h
41src/ccutils_xt.cc
42src/ccutils_xt.h
43src/database_xt.cc
44src/database_xt.h
45src/datadic_xt.cc
46src/datadic_xt.h
47src/datalog_xt.cc
48src/datalog_xt.h
49src/discover_xt.cc
50src/discover_xt.h
51src/filesys_xt.cc
52src/filesys_xt.h
53src/hashtab_xt.cc
54src/hashtab_xt.h
55src/ha_pbxt.cc
56src/ha_pbxt.h
57src/ha_xtsys.cc
58src/ha_xtsys.h
59src/heap_xt.cc
60src/heap_xt.h
61src/index_xt.cc
62src/index_xt.h
63src/linklist_xt.cc
64src/linklist_xt.h
65src/locklist_xt.cc
66src/locklist_xt.h
67src/lock_xt.cc
68src/lock_xt.h
69src/memory_xt.cc
70src/memory_xt.h
71src/myxt_xt.cc
72src/myxt_xt.h
73src/pbms.h
74src/pbms_enabled.cc
75src/pbms_enabled.h
76src/pthread_xt.cc
77src/pthread_xt.h
78src/restart_xt.cc
79src/restart_xt.h
80src/sortedlist_xt.cc
81src/sortedlist_xt.h
82src/strutil_xt.cc
83src/strutil_xt.h
84src/systab_xt.cc
85src/systab_xt.h
86src/tabcache_xt.cc
87src/tabcache_xt.h
88src/table_xt.cc
89src/table_xt.h
90src/thread_xt.cc
91src/thread_xt.h
92src/trace_xt.cc
93src/trace_xt.h
94src/util_xt.cc
95src/util_xt.h
96src/xaction_xt.cc
97src/xaction_xt.h
98src/xactlog_xt.cc
99src/xactlog_xt.h
100src/xt_config.h
101src/xt_defs.h
102src/xt_errno.h)
103
104MYSQL_STORAGE_ENGINE(PBXT)
0105
=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2008-11-04 13:53:25 +0000
+++ src/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
1# Copyright (c) 2008 PrimeBase Technologies GmbH
2#
3# PrimeBase XT
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2 of the License, or
8# (at your option) any later version.
9#
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with this program; if not, write to the Free Software
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18#
19# 2006-03-22 Paul McCullagh
20#
21# H&G2JCtL
22#
23# This file is used to make the Windows version
24
25SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQL_SERVER")
26SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMYSQL_SERVER")
27
28SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
29SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DMYSQL_SERVER -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
30
31INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
32 ${CMAKE_SOURCE_DIR}/regex
33 ${CMAKE_SOURCE_DIR}/extra/yassl/include)
34
35SET(PBXT_SOURCES ha_pbxt.cc bsearch_xt.cc index_xt.cc strutil_xt.cc cache_xt.cc linklist_xt.cc
36 ccutils_xt.cc lock_xt.cc table_xt.cc database_xt.cc thread_xt.cc
37 datadic_xt.cc memory_xt.cc trace_xt.cc datalog_xt.cc myxt_xt.cc util_xt.cc
38 filesys_xt.cc pthread_xt.cc xaction_xt.cc restart_xt.cc xactlog_xt.cc
39 hashtab_xt.cc sortedlist_xt.cc heap_xt.cc streaming_xt.cc tabcache_xt.cc
40 systab_xt.cc ha_xtsys.cc discover_xt.cc
41 bsearch_xt.h linklist_xt.h tabcache_xt.h cache_xt.h lock_xt.h table_xt.h
42 ccutils_xt.h thread_xt.h database_xt.h memory_xt.h trace_xt.h
43 datadic_xt.h pbms.h util_xt.h datalog_xt.h myxt_xt.h xaction_xt.h
44 filesys_xt.h pthread_xt.h xactlog_xt.h ha_pbxt.h restart_xt.h xt_config.h
45 hashtab_xt.h sortedlist_xt.h xt_defs.h heap_xt.h streaming_xt.h xt_errno.h
46 systab_xt.h ha_xtsys.h discover_xt.h
47 index_xt.h strutil_xt.h)
48
49IF(NOT SOURCE_SUBLIBS)
50 ADD_LIBRARY(pbxt ${PBXT_SOURCES})
51 ADD_DEPENDENCIES(pbxt GenError)
52ENDIF(NOT SOURCE_SUBLIBS)
53
540
=== modified file 'src/xt_config.h'
--- src/xt_config.h 2009-09-10 12:12:18 +0000
+++ src/xt_config.h 2009-09-17 10:54:30 +0000
@@ -77,7 +77,7 @@
77#endif77#endif
7878
79#ifdef XT_WIN79#ifdef XT_WIN
80#ifdef _DEBUG80#if defined(_DEBUG) && !defined(DEBUG)
81#define DEBUG81#define DEBUG
82#endif // _DEBUG82#endif // _DEBUG
83#else83#else

Subscribers

People subscribed via source and target branches