Merge lp:~tobi-coldtobi/drizzle/drizzle into lp:drizzle

[coldtobi]

Unmerged revisions

2643. By Tobias Frost <email address hidden> on 2013-09-05

Fix build for boost >1.54
boost:system needs to be linked in when using boost::thread
boost::progamm-options does not take char* as pointer, reworked
to use std::string

=== modified file 'client/drizzleslap.cc'
--- client/drizzleslap.cc	2012-12-13 18:45:19 +0000
+++ client/drizzleslap.cc	2013-09-05 17:33:49 +0000
@@ -433,7 +433,8 @@
  */
 int main(int argc, char **argv)
 {
-  char *password= NULL;
+  std::string stpassword;
+
   try
   {
     po::options_description commandline_options("Options used only in command line");
@@ -535,7 +536,7 @@
     po::options_description client_options("Options specific to the client");
     client_options.add_options()
       ("host,h",po::value<string>(&host)->default_value("localhost"),"Connect to the host")
-      ("password,P",po::value<char *>(&password),
+      ("password,P",po::value<std::string >(&stpassword),
        "Password to use when connecting to server. If password is not given it's asked from the tty")
       ("port,p",po::value<uint32_t>(), "Port number to use for connection")
       ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
@@ -643,13 +644,13 @@
   {
     if (not opt_password.empty())
       opt_password.erase();
-    if (password == PASSWORD_SENTINEL)
+    if (stpassword == PASSWORD_SENTINEL)
     {
       opt_password= "";
     }
     else
     {
-      opt_password= password;
+      opt_password= stpassword;
       tty_password= false;
     }
   }

=== modified file 'drizzled/message/include.am'
--- drizzled/message/include.am	2013-01-29 04:33:23 +0000
+++ drizzled/message/include.am	2013-09-05 17:33:49 +0000
@@ -40,7 +40,7 @@
 drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 
 drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
-drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
+drizzled_message_libdrizzledmessage_la_LIBADD= ${BOOST_LIBS} ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
 
 nobase_dist_pkginclude_HEADERS+= \
 			      drizzled/message/statement_transform.h
@@ -89,7 +89,7 @@
 drizzled_message_schema_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
 
 drizzled_message_table_reader_SOURCES =  drizzled/message/table_reader.cc
-drizzled_message_table_reader_LDADD = ${MESSAGE_LDADD}
+drizzled_message_table_reader_LDADD = ${BOOST_LIBS} ${MESSAGE_LDADD}
 drizzled_message_table_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
 
 drizzled_message_table_raw_reader_SOURCES =  drizzled/message/table_raw_reader.cc
@@ -104,7 +104,7 @@
 drizzled_message_table_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
 
 drizzled_message_transaction_writer_SOURCES =  drizzled/message/transaction_writer.cc
-drizzled_message_transaction_writer_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la
+drizzled_message_transaction_writer_LDADD = ${BOOST_LIBS} ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la
 drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 
 EXTRA_DIST += \