~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/include.am

Committer: Mark Atwood
Date: 2011-11-04 21:13:51 UTC
mfrom: (2449.1.2 drizzle-build)
Revision ID: me@mark.atwood.name-20111104211351-us53noq84fuqafqv

merge lp:~brianaker/drizzle/bug-fix-879128

files added:
libdrizzle

libdrizzle/drizzle.h

libdrizzle/include.am

files removed:
libdrizzle-1.0/libdrizzle

libdrizzle-2.0/libdrizzle

plugin/innobase/xtrabackup/Makefile

tests/randgen/Makefile

tests/sql-bench/Makefile.in

files renamed:
libdrizzle-1.0/libdrizzle/column.c => libdrizzle-1.0/column.c

libdrizzle-1.0/libdrizzle/column.h => libdrizzle-1.0/column.h

libdrizzle-1.0/libdrizzle/column_client.h => libdrizzle-1.0/column_client.h

libdrizzle-1.0/libdrizzle/column_server.h => libdrizzle-1.0/column_server.h

libdrizzle-1.0/libdrizzle/command.c => libdrizzle-1.0/command.c

libdrizzle-1.0/libdrizzle/command_client.h => libdrizzle-1.0/command_client.h

libdrizzle-1.0/libdrizzle/command_server.h => libdrizzle-1.0/command_server.h

libdrizzle-1.0/libdrizzle/common.h => libdrizzle-1.0/common.h

libdrizzle-1.0/libdrizzle/conn.c => libdrizzle-1.0/conn.c

libdrizzle-1.0/libdrizzle/conn.h => libdrizzle-1.0/conn.h

libdrizzle-1.0/libdrizzle/conn_client.h => libdrizzle-1.0/conn_client.h

libdrizzle-1.0/libdrizzle/conn_local.h => libdrizzle-1.0/conn_local.h

libdrizzle-1.0/libdrizzle/conn_server.h => libdrizzle-1.0/conn_server.h

libdrizzle-1.0/libdrizzle/conn_uds.c => libdrizzle-1.0/conn_uds.c

libdrizzle-1.0/libdrizzle/constants.h => libdrizzle-1.0/constants.h

libdrizzle-1.0/libdrizzle/drizzle.c => libdrizzle-1.0/drizzle.c

libdrizzle-1.0/libdrizzle/drizzle.h => libdrizzle-1.0/drizzle.h

libdrizzle-1.0/libdrizzle/drizzle_client.h => libdrizzle-1.0/drizzle_client.h

libdrizzle-1.0/libdrizzle/drizzle_local.h => libdrizzle-1.0/drizzle_local.h

libdrizzle-1.0/libdrizzle/drizzle_server.h => libdrizzle-1.0/drizzle_server.h

libdrizzle-1.0/libdrizzle/field.c => libdrizzle-1.0/field.c

libdrizzle-1.0/libdrizzle/field_client.h => libdrizzle-1.0/field_client.h

libdrizzle-1.0/libdrizzle/field_server.h => libdrizzle-1.0/field_server.h

libdrizzle-1.0/libdrizzle/handshake.c => libdrizzle-1.0/handshake.c

libdrizzle-1.0/libdrizzle/handshake_client.h => libdrizzle-1.0/handshake_client.h

libdrizzle-1.0/libdrizzle/handshake_server.h => libdrizzle-1.0/handshake_server.h

libdrizzle-1.0/libdrizzle/include.am => libdrizzle-1.0/include.am

libdrizzle-1.0/libdrizzle/libdrizzle.h => libdrizzle-1.0/libdrizzle.h

libdrizzle-1.0/libdrizzle/mysql_password_hash.cc => libdrizzle-1.0/mysql_password_hash.cc

libdrizzle-1.0/libdrizzle/pack.c => libdrizzle-1.0/pack.c

libdrizzle-1.0/libdrizzle/pack.h => libdrizzle-1.0/pack.h

libdrizzle-1.0/libdrizzle/query.c => libdrizzle-1.0/query.c

libdrizzle-1.0/libdrizzle/query.h => libdrizzle-1.0/query.h

libdrizzle-1.0/libdrizzle/result.c => libdrizzle-1.0/result.c

libdrizzle-1.0/libdrizzle/result.h => libdrizzle-1.0/result.h

libdrizzle-1.0/libdrizzle/result_client.h => libdrizzle-1.0/result_client.h

libdrizzle-1.0/libdrizzle/result_server.h => libdrizzle-1.0/result_server.h

libdrizzle-1.0/libdrizzle/row.c => libdrizzle-1.0/row.c

libdrizzle-1.0/libdrizzle/row_client.h => libdrizzle-1.0/row_client.h

libdrizzle-1.0/libdrizzle/row_server.h => libdrizzle-1.0/row_server.h

libdrizzle-1.0/libdrizzle/sha1.c => libdrizzle-1.0/sha1.c

libdrizzle-1.0/libdrizzle/sha1.h => libdrizzle-1.0/sha1.h

libdrizzle-1.0/libdrizzle/state.c => libdrizzle-1.0/state.c

libdrizzle-1.0/libdrizzle/state.h => libdrizzle-1.0/state.h

libdrizzle-1.0/libdrizzle/structs.h => libdrizzle-1.0/structs.h

libdrizzle-1.0/libdrizzle/visibility.h => libdrizzle-1.0/visibility.h

libdrizzle-2.0/libdrizzle/column.cc => libdrizzle-2.0/column.cc

libdrizzle-2.0/libdrizzle/column.h => libdrizzle-2.0/column.h

libdrizzle-2.0/libdrizzle/column_client.h => libdrizzle-2.0/column_client.h

libdrizzle-2.0/libdrizzle/column_server.h => libdrizzle-2.0/column_server.h

libdrizzle-2.0/libdrizzle/command.cc => libdrizzle-2.0/command.cc

libdrizzle-2.0/libdrizzle/command_client.h => libdrizzle-2.0/command_client.h

libdrizzle-2.0/libdrizzle/command_server.h => libdrizzle-2.0/command_server.h

libdrizzle-2.0/libdrizzle/common.h => libdrizzle-2.0/common.h

libdrizzle-2.0/libdrizzle/conn.cc => libdrizzle-2.0/conn.cc

libdrizzle-2.0/libdrizzle/conn.h => libdrizzle-2.0/conn.h

libdrizzle-2.0/libdrizzle/conn_client.h => libdrizzle-2.0/conn_client.h

libdrizzle-2.0/libdrizzle/conn_local.h => libdrizzle-2.0/conn_local.h

libdrizzle-2.0/libdrizzle/conn_server.h => libdrizzle-2.0/conn_server.h

libdrizzle-2.0/libdrizzle/conn_uds.cc => libdrizzle-2.0/conn_uds.cc

libdrizzle-2.0/libdrizzle/constants.h => libdrizzle-2.0/constants.h

libdrizzle-2.0/libdrizzle/drizzle.cc => libdrizzle-2.0/drizzle.cc

libdrizzle-2.0/libdrizzle/drizzle.h => libdrizzle-2.0/drizzle.h

libdrizzle-2.0/libdrizzle/drizzle_client.h => libdrizzle-2.0/drizzle_client.h

libdrizzle-2.0/libdrizzle/drizzle_local.h => libdrizzle-2.0/drizzle_local.h

libdrizzle-2.0/libdrizzle/drizzle_server.h => libdrizzle-2.0/drizzle_server.h

libdrizzle-2.0/libdrizzle/field.cc => libdrizzle-2.0/field.cc

libdrizzle-2.0/libdrizzle/field_client.h => libdrizzle-2.0/field_client.h

libdrizzle-2.0/libdrizzle/field_server.h => libdrizzle-2.0/field_server.h

libdrizzle-2.0/libdrizzle/handshake.cc => libdrizzle-2.0/handshake.cc

libdrizzle-2.0/libdrizzle/handshake_client.h => libdrizzle-2.0/handshake_client.h

libdrizzle-2.0/libdrizzle/handshake_server.h => libdrizzle-2.0/handshake_server.h

libdrizzle-2.0/libdrizzle/include.am => libdrizzle-2.0/include.am

libdrizzle-2.0/libdrizzle/libdrizzle.h => libdrizzle-2.0/libdrizzle.h

libdrizzle-2.0/libdrizzle/libdrizzle.hpp => libdrizzle-2.0/libdrizzle.hpp

libdrizzle-2.0/libdrizzle/mysql_password_hash.cc => libdrizzle-2.0/mysql_password_hash.cc

libdrizzle-2.0/libdrizzle/pack.cc => libdrizzle-2.0/pack.cc

libdrizzle-2.0/libdrizzle/pack.h => libdrizzle-2.0/pack.h

libdrizzle-2.0/libdrizzle/query.cc => libdrizzle-2.0/query.cc

libdrizzle-2.0/libdrizzle/query.h => libdrizzle-2.0/query.h

libdrizzle-2.0/libdrizzle/result.cc => libdrizzle-2.0/result.cc

libdrizzle-2.0/libdrizzle/result.h => libdrizzle-2.0/result.h

libdrizzle-2.0/libdrizzle/result_client.h => libdrizzle-2.0/result_client.h

libdrizzle-2.0/libdrizzle/result_server.h => libdrizzle-2.0/result_server.h

libdrizzle-2.0/libdrizzle/row.cc => libdrizzle-2.0/row.cc

libdrizzle-2.0/libdrizzle/row_client.h => libdrizzle-2.0/row_client.h

libdrizzle-2.0/libdrizzle/row_server.h => libdrizzle-2.0/row_server.h

libdrizzle-2.0/libdrizzle/sha1.cc => libdrizzle-2.0/sha1.cc

libdrizzle-2.0/libdrizzle/sha1.h => libdrizzle-2.0/sha1.h

libdrizzle-2.0/libdrizzle/state.cc => libdrizzle-2.0/state.cc

libdrizzle-2.0/libdrizzle/state.h => libdrizzle-2.0/state.h

libdrizzle-2.0/libdrizzle/structs.h => libdrizzle-2.0/structs.h

libdrizzle-2.0/libdrizzle/visibility.h => libdrizzle-2.0/visibility.h

files modified:
.bzrignore

Makefile.am

client/client_priv.h

client/drizzle.cc

client/drizzledump.cc

client/drizzledump_drizzle.h

client/drizzletest.cc

client/include.am

examples/client.cc

examples/pipe_query.cc

examples/proxy.cc

examples/server.cc

examples/simple.cc

examples/simple_multi.cc

examples/sqlite_server.cc

plugin/mysql_protocol/mysql_protocol.cc

plugin/slave/plugin.ini

plugin/transaction_log/plugin.am

unittests/include.am

unittests/libdrizzle_test.cc

win32/include.am

Show diffs side-by-side

added added

removed removed

libdrizzle-1.0/include.am

# vim:ft=automake

# Drizzle Client Library

# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

lib_LTLIBRARIES+= libdrizzle-1.0/libdrizzle/libdrizzle.la

libdrizzle_1_0_libdrizzle_libdrizzle_la_CFLAGS= \

${AM_CFLAGS} \

${OLDLIBDRIZZLE_CPPFLAGS} \

${CFLAG_VISIBILITY} \

-DBUILDING_LIBDRIZZLE

libdrizzle_1_0_libdrizzle_libdrizzle_la_LDFLAGS= \

$(AM_LDFLAGS) \

$(GCOV_LIBS) \

-version-info \

$(OLDLIBDRIZZLE_LIBRARY_VERSION)

oldlibdrizzlepkgconfigdir= $(libdir)/pkgconfig

oldlibdrizzlepkgconfig_DATA= \

support-files/libdrizzle-1.0.pc

libdrizzle_1_0_libdrizzle_libdrizzle_la_SOURCES= \

libdrizzle-1.0/libdrizzle/column.c \

libdrizzle-1.0/libdrizzle/command.c \

libdrizzle-1.0/libdrizzle/conn.c \

libdrizzle-1.0/libdrizzle/conn_uds.c \

libdrizzle-1.0/libdrizzle/drizzle.c \

libdrizzle-1.0/libdrizzle/field.c \

libdrizzle-1.0/libdrizzle/handshake.c \

libdrizzle-1.0/libdrizzle/pack.c \

libdrizzle-1.0/libdrizzle/query.c \

libdrizzle-1.0/libdrizzle/result.c \

libdrizzle-1.0/libdrizzle/row.c \

libdrizzle-1.0/libdrizzle/sha1.c \

libdrizzle-1.0/libdrizzle/state.c

lib_LTLIBRARIES+= libdrizzle-1.0/libdrizzle.la

libdrizzle_1_0_libdrizzle_la_CFLAGS= \

${AM_CFLAGS} \

${OLDLIBDRIZZLE_CPPFLAGS} \

${CFLAG_VISIBILITY} \

-DBUILDING_LIBDRIZZLE

libdrizzle_1_0_libdrizzle_la_LDFLAGS= \

$(AM_LDFLAGS) \

$(GCOV_LIBS) \

-version-info \

$(OLDLIBDRIZZLE_LIBRARY_VERSION)

libdrizzle_1_0_libdrizzle_la_SOURCES= \

libdrizzle-1.0/column.c \

libdrizzle-1.0/command.c \

libdrizzle-1.0/conn.c \

libdrizzle-1.0/conn_uds.c \

libdrizzle-1.0/drizzle.c \

libdrizzle-1.0/field.c \

libdrizzle-1.0/handshake.c \

libdrizzle-1.0/pack.c \

libdrizzle-1.0/query.c \

libdrizzle-1.0/result.c \

libdrizzle-1.0/row.c \

libdrizzle-1.0/sha1.c \

libdrizzle-1.0/state.c

dist_oldlibdrizzleinstall_HEADERS= \

libdrizzle-1.0/libdrizzle/column.h \

libdrizzle-1.0/libdrizzle/column_client.h \

libdrizzle-1.0/libdrizzle/column_server.h \

libdrizzle-1.0/libdrizzle/command_client.h \

libdrizzle-1.0/libdrizzle/command_server.h \

libdrizzle-1.0/libdrizzle/conn.h \

libdrizzle-1.0/libdrizzle/conn_client.h \

libdrizzle-1.0/libdrizzle/conn_server.h \

libdrizzle-1.0/libdrizzle/constants.h \

libdrizzle-1.0/libdrizzle/drizzle.h \

libdrizzle-1.0/libdrizzle/drizzle_client.h \

libdrizzle-1.0/libdrizzle/drizzle_server.h \

libdrizzle-1.0/libdrizzle/field_client.h \

libdrizzle-1.0/libdrizzle/field_server.h \

libdrizzle-1.0/libdrizzle/handshake_client.h \

libdrizzle-1.0/libdrizzle/handshake_server.h \

libdrizzle-1.0/libdrizzle/libdrizzle.h \

libdrizzle-1.0/libdrizzle/query.h \

libdrizzle-1.0/libdrizzle/result.h \

libdrizzle-1.0/libdrizzle/result_client.h \

libdrizzle-1.0/libdrizzle/result_server.h \

libdrizzle-1.0/libdrizzle/row_client.h \

libdrizzle-1.0/libdrizzle/row_server.h \

libdrizzle-1.0/libdrizzle/structs.h \

libdrizzle-1.0/libdrizzle/visibility.h

libdrizzle-1.0/column.h \

libdrizzle-1.0/column_client.h \

libdrizzle-1.0/column_server.h \

libdrizzle-1.0/command_client.h \

libdrizzle-1.0/command_server.h \

libdrizzle-1.0/conn.h \

libdrizzle-1.0/conn_client.h \

libdrizzle-1.0/conn_server.h \

libdrizzle-1.0/constants.h \

libdrizzle-1.0/drizzle.h \

libdrizzle-1.0/drizzle_client.h \

libdrizzle-1.0/drizzle_server.h \

libdrizzle-1.0/field_client.h \

libdrizzle-1.0/field_server.h \

libdrizzle-1.0/handshake_client.h \

libdrizzle-1.0/handshake_server.h \

libdrizzle-1.0/libdrizzle.h \

libdrizzle-1.0/query.h \

libdrizzle-1.0/result.h \

libdrizzle-1.0/result_client.h \

libdrizzle-1.0/result_server.h \

libdrizzle-1.0/row_client.h \

libdrizzle-1.0/row_server.h \

libdrizzle-1.0/structs.h \

libdrizzle-1.0/visibility.h

noinst_HEADERS+= \

libdrizzle-1.0/libdrizzle/common.h \

libdrizzle-1.0/libdrizzle/drizzle_local.h \

libdrizzle-1.0/libdrizzle/conn_local.h \

100

libdrizzle-1.0/libdrizzle/pack.h \

101

libdrizzle-1.0/libdrizzle/state.h \

102

libdrizzle-1.0/libdrizzle/sha1.h

libdrizzle-1.0/common.h \

libdrizzle-1.0/drizzle_local.h \

libdrizzle-1.0/conn_local.h \

libdrizzle-1.0/pack.h \

libdrizzle-1.0/state.h \

libdrizzle-1.0/sha1.h

103

100

104

libdrizzle-1.0: libdrizzle-1.0/libdrizzle/libdrizzle.la

105

install-libdrizzle-1.0: libdrizzle-1.0 install-dist_oldlibdrizzleinstallHEADERS install-oldlibdrizzlepkgconfigDATA

101

libdrizzle-1.0: libdrizzle-1.0/libdrizzle.la

102

install-libdrizzle-1.0: libdrizzle-1.0 install-dist_oldlibdrizzleinstallHEADERS

106

103

test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

107

echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle/libdrizzle.la '$(DESTDIR)$(libdir)'";

108

$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle/libdrizzle.la "$(DESTDIR)$(libdir)";

104

echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle.la '$(DESTDIR)$(libdir)'";

105

$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle.la "$(DESTDIR)$(libdir)";

109

106

Older »