Drizzle Client & Protocol Library

Merge lp:~brianaker/libdrizzle/lp-1093585 into lp:libdrizzle

  1. lp-1093585
  2. Merge into libdrizzle-redux
Proposed by Brian Aker
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 65
Merged at revision: 63
Proposed branch: lp:~brianaker/libdrizzle/lp-1093585
Merge into: lp:libdrizzle
Diff against target: 159 lines (+27/-8)
10 files modified
Makefile.am (+6/-6)
cli/drizzle_binlogs_check.sh (+4/-0)
cli/include.am (+8/-1)
configure.ac (+3/-1)
tests/unit/binlog.c (+1/-0)
tests/unit/connect.c (+1/-0)
tests/unit/insert_id.c (+1/-0)
tests/unit/query.c (+1/-0)
tests/unit/statement.c (+1/-0)
tests/unit/unbuffered_query.c (+1/-0)
To merge this branch: bzr merge lp:~brianaker/libdrizzle/lp-1093585
Reviewer Review Type Date Requested Status
Andrew Hutchings Approve
Review via email: mp+141310@code.launchpad.net
To post a comment you must log in.
lp:~brianaker/libdrizzle/lp-1093585 updated
63. By Brian Aker

Fix for uninstall of libdrizzle-config

64. By Brian Aker

Fix for when glib is not available. When it is available we do a sanity check on the binary.

65. By Brian Aker

Fix a few valgrind warnings.

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-12-24 10:20:04 +0000
3+++ Makefile.am 2012-12-27 12:32:26 +0000
4@@ -9,6 +9,7 @@
5 CLEANFILES =
6 DISTCLEANFILES =
7 bin_PROGRAMS =
8+dist_bin_SCRIPTS =
9 noinst_HEADERS =
10 lib_LTLIBRARIES =
11 man_MANS =
12@@ -17,17 +18,20 @@
13 include_HEADERS =
14 nobase_include_HEADERS =
15 check_PROGRAMS =
16+check_SCRIPTS =
17 EXTRA_HEADERS =
18 BUILT_SOURCES=
19 EXTRA_DIST=
20+EXTRA_SCRIPTS=
21 CONFIGURE_DEPENDENCIES=
22 PREFIX= @prefix@
23
24 #includes additional rules from aminclude.am
25 @INC_AMINCLUDE@
26 DISTCLEANFILES+= aminclude.am
27+CLEANFILES+= $(dist_bin_SCRIPTS)
28
29-TESTS+= ${check_PROGRAMS}
30+TESTS+= ${check_PROGRAMS} ${check_SCRIPTS}
31
32 include tests/include.am
33 include m4/include.am
34@@ -65,8 +69,4 @@
35 -rm -f @PACKAGE@-*.rpm
36 -rm @GENERIC_CONFIG@
37
38-install-exec-local: install-generic-config
39-
40-install-generic-config:
41- $(mkinstalldirs) $(DESTDIR)$(bindir)
42- $(INSTALL_SCRIPT) @GENERIC_CONFIG@ $(DESTDIR)$(bindir)
43+dist_bin_SCRIPTS+= @GENERIC_CONFIG@
44
45=== added file 'cli/drizzle_binlogs_check.sh'
46--- cli/drizzle_binlogs_check.sh 1970-01-01 00:00:00 +0000
47+++ cli/drizzle_binlogs_check.sh 2012-12-27 12:32:26 +0000
48@@ -0,0 +1,4 @@
49+#!/bin/sh
50+# Simple test for drizzle_binlog
51+
52+cli/drizzle_binlogs --help &> /dev/null
53
54=== modified file 'cli/include.am'
55--- cli/include.am 2012-12-21 13:17:29 +0000
56+++ cli/include.am 2012-12-27 12:32:26 +0000
57@@ -2,8 +2,15 @@
58 # included from Top Level Makefile.am
59 # All paths should be given relative to the root
60
61+if HAVE_GLIB
62+
63 bin_PROGRAMS+= cli/drizzle_binlogs
64 cli_drizzle_binlogs_SOURCES= cli/drizzle_binlogs.c
65-cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la @GLIB_LIBS@
66+cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la
67+cli_drizzle_binlogs_LDADD+= @GLIB_LIBS@
68 cli_drizzle_binlogs_CFLAGS= @GLIB_CFLAGS@
69 cli_drizzle_binlogs_CXXFLAGS= @GLIB_CFLAGS@
70+
71+check_SCRIPTS+= cli/drizzle_binlogs_check.sh
72+
73+endif
74
75=== modified file 'configure.ac'
76--- configure.ac 2012-12-24 10:20:04 +0000
77+++ configure.ac 2012-12-27 12:32:26 +0000
78@@ -59,7 +59,9 @@
79 # Checks for libraries.
80 AX_CXX_GCC_ABI_DEMANGLE
81 AX_CHECK_OPENSSL
82-AM_PATH_GLIB_2_0
83+AM_PATH_GLIB_2_0(,[HAVE_GLIB=false],[HAVE_GLIB=true])
84+
85+AM_CONDITIONAL([HAVE_GLIB],[test "x$HAVE_GLIB"="xtrue"])
86
87 # Checks for header files.
88 AC_DEFUN([CHECK_FOR_CXXABI],
89
90=== modified file 'tests/unit/binlog.c'
91--- tests/unit/binlog.c 2012-12-24 10:20:04 +0000
92+++ tests/unit/binlog.c 2012-12-27 12:32:26 +0000
93@@ -64,6 +64,7 @@
94 if (ret != DRIZZLE_RETURN_OK)
95 {
96 printf("Drizzle connection failure\n");
97+ drizzle_quit(con);
98 return EXIT_SKIP;
99 }
100
101
102=== modified file 'tests/unit/connect.c'
103--- tests/unit/connect.c 2012-12-24 10:20:04 +0000
104+++ tests/unit/connect.c 2012-12-27 12:32:26 +0000
105@@ -62,6 +62,7 @@
106 if (ret != DRIZZLE_RETURN_OK)
107 {
108 printf("Drizzle connection failure\n");
109+ drizzle_quit(con);
110 return EXIT_SKIP;
111 }
112
113
114=== modified file 'tests/unit/insert_id.c'
115--- tests/unit/insert_id.c 2012-12-24 10:20:04 +0000
116+++ tests/unit/insert_id.c 2012-12-27 12:32:26 +0000
117@@ -63,6 +63,7 @@
118 if (ret != DRIZZLE_RETURN_OK)
119 {
120 printf("Drizzle connection failure\n");
121+ drizzle_quit(con);
122 return EXIT_SKIP;
123 }
124
125
126=== modified file 'tests/unit/query.c'
127--- tests/unit/query.c 2012-12-24 10:20:04 +0000
128+++ tests/unit/query.c 2012-12-27 12:32:26 +0000
129@@ -65,6 +65,7 @@
130 if (ret != DRIZZLE_RETURN_OK)
131 {
132 printf("Drizzle connection failure\n");
133+ drizzle_quit(con);
134 return EXIT_SKIP;
135 }
136
137
138=== modified file 'tests/unit/statement.c'
139--- tests/unit/statement.c 2012-12-24 10:20:04 +0000
140+++ tests/unit/statement.c 2012-12-27 12:32:26 +0000
141@@ -63,6 +63,7 @@
142 if (ret != DRIZZLE_RETURN_OK)
143 {
144 printf("Drizzle connection failure\n");
145+ drizzle_quit(con);
146 return EXIT_SKIP;
147 }
148
149
150=== modified file 'tests/unit/unbuffered_query.c'
151--- tests/unit/unbuffered_query.c 2012-12-24 10:20:04 +0000
152+++ tests/unit/unbuffered_query.c 2012-12-27 12:32:26 +0000
153@@ -65,6 +65,7 @@
154 if (ret != DRIZZLE_RETURN_OK)
155 {
156 printf("Drizzle connection failure\n");
157+ drizzle_quit(con);
158 return EXIT_SKIP;
159 }
160

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: