MySQL Proxy

Merge lp:~miguelaraujo/mysql-proxy/missing-files-cmakelists into lp:mysql-proxy/0.8

  1. missing-files-cmakelists
  2. Merge into 0.8
Proposed by Miguel Araújo
Status: Merged
Merge reported by: Jan Kneschke
Merged at revision: not available
Proposed branch: lp:~miguelaraujo/mysql-proxy/missing-files-cmakelists
Merge into: lp:mysql-proxy/0.8
Diff against target: 71 lines (+12/-1)
4 files modified
CMakeLists.txt (+7/-1)
config.h.cmake (+1/-0)
examples/CMakeLists.txt (+2/-0)
lib/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~miguelaraujo/mysql-proxy/missing-files-cmakelists
Reviewer Review Type Date Requested Status
Jan Kneschke (community) Approve
Review via email: mp+92808@code.launchpad.net

Description of the change

Added missing files to CMakeLists:
    - admin-sql.lua
    - ro-pooling.lua
    - tutorial-prep-stmts.lua
    - tutorial-scramble.lua

To post a comment you must log in.
lp:~miguelaraujo/mysql-proxy/missing-files-cmakelists updated
1235. By Miguel Araújo

Fixed cmake build on systems where ulong is defined (like Linux)

Revision history for this message
Jan Kneschke (jan-kneschke) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-10-13 08:54:21 +0000
3+++ CMakeLists.txt 2012-02-14 11:39:52 +0000
4@@ -186,13 +186,19 @@
5 CHECK_FUNCTION_EXISTS(writev HAVE_WRITEV)
6 CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO)
7 # check for gthread actually being present
8-CHECK_LIBRARY_EXISTS(gthread-2.0 g_thread_init ${GTHREAD_LIBRARY_DIRS} HAVE_GTHREAD)
9+CHECK_LIBRARY_EXISTS(gthread-2.0 g_thread_init "${GTHREAD_LIBRARY_DIRS}" HAVE_GTHREAD)
10 #SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
11 #SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GTHREAD_LIBRARIES})
12 # fails for some reason use check_library_exists instead and hope it's better
13 #CHECK_FUNCTION_EXISTS(g_thread_init HAVE_GTHREAD)
14 #SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
15
16+IF(${HAVE_SYS_TYPES_H})
17+ SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
18+ CHECK_TYPE_SIZE(ulong HAVE_ULONG)
19+ SET(CMAKE_EXTRA_INCLUDE_FILES )
20+ENDIF(${HAVE_SYS_TYPES_H})
21+
22 IF(${HAVE_SYS_SOCKET_H})
23 SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
24 CHECK_TYPE_SIZE(socklen_t HAVE_SOCKLEN_T)
25
26=== modified file 'config.h.cmake'
27--- config.h.cmake 2009-12-10 15:34:29 +0000
28+++ config.h.cmake 2012-02-14 11:39:52 +0000
29@@ -34,6 +34,7 @@
30 #cmakedefine HAVE_WRITEV
31
32 #cmakedefine HAVE_SOCKLEN_T
33+#cmakedefine HAVE_ULONG
34
35 #cmakedefine HAVE_GTHREAD
36 #cmakedefine HAVE_GTHREAD_H
37
38=== modified file 'examples/CMakeLists.txt'
39--- examples/CMakeLists.txt 2009-07-03 12:29:52 +0000
40+++ examples/CMakeLists.txt 2012-02-14 11:39:52 +0000
41@@ -11,9 +11,11 @@
42 tutorial-monitor.lua
43 tutorial-packets.lua
44 tutorial-query-time.lua
45+ tutorial-prep-stmts.lua
46 tutorial-resultset.lua
47 tutorial-rewrite.lua
48 tutorial-routing.lua
49+ tutorial-scramble.lua
50 tutorial-states.lua
51 tutorial-tokenize.lua
52 tutorial-union.lua
53
54=== modified file 'lib/CMakeLists.txt'
55--- lib/CMakeLists.txt 2011-04-07 16:51:31 +0000
56+++ lib/CMakeLists.txt 2012-02-14 11:39:52 +0000
57@@ -3,6 +3,7 @@
58 INSTALL(FILES
59 active-queries.lua
60 active-transactions.lua
61+ admin-sql.lua
62 analyze-query.lua
63 auditing.lua
64 commit-obfuscator.lua
65@@ -10,6 +11,7 @@
66 histogram.lua
67 load-multi.lua
68 ro-balance.lua
69+ ro-pooling.lua
70 rw-splitting.lua
71 xtab.lua
72

Subscribers

People subscribed via source and target branches