Drizzle

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

  1. drizzle
  2. Merge into 7.2
Proposed by coldtobi
Status: Needs review
Proposed branch: lp:~tobi-coldtobi/drizzle/drizzle
Merge into: lp:drizzle
Diff against target: 69 lines (+8/-7)
2 files modified
client/drizzleslap.cc (+5/-4)
drizzled/message/include.am (+3/-3)
To merge this branch: bzr merge lp:~tobi-coldtobi/drizzle/drizzle
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+184154@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

2643. By Tobias Frost <email address hidden>

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
433 */433 */
434int main(int argc, char **argv)434int main(int argc, char **argv)
435{435{
436 char *password= NULL;436 std::string stpassword;
437
437 try438 try
438 {439 {
439 po::options_description commandline_options("Options used only in command line");440 po::options_description commandline_options("Options used only in command line");
@@ -535,7 +536,7 @@
535 po::options_description client_options("Options specific to the client");536 po::options_description client_options("Options specific to the client");
536 client_options.add_options()537 client_options.add_options()
537 ("host,h",po::value<string>(&host)->default_value("localhost"),"Connect to the host")538 ("host,h",po::value<string>(&host)->default_value("localhost"),"Connect to the host")
538 ("password,P",po::value<char *>(&password),539 ("password,P",po::value<std::string >(&stpassword),
539 "Password to use when connecting to server. If password is not given it's asked from the tty")540 "Password to use when connecting to server. If password is not given it's asked from the tty")
540 ("port,p",po::value<uint32_t>(), "Port number to use for connection")541 ("port,p",po::value<uint32_t>(), "Port number to use for connection")
541 ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),542 ("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),
@@ -643,13 +644,13 @@
643 {644 {
644 if (not opt_password.empty())645 if (not opt_password.empty())
645 opt_password.erase();646 opt_password.erase();
646 if (password == PASSWORD_SENTINEL)647 if (stpassword == PASSWORD_SENTINEL)
647 {648 {
648 opt_password= "";649 opt_password= "";
649 }650 }
650 else651 else
651 {652 {
652 opt_password= password;653 opt_password= stpassword;
653 tty_password= false;654 tty_password= false;
654 }655 }
655 }656 }
656657
=== 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 @@
40drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}40drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
4141
42drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc42drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
43drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la43drizzled_message_libdrizzledmessage_la_LIBADD= ${BOOST_LIBS} ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
4444
45nobase_dist_pkginclude_HEADERS+= \45nobase_dist_pkginclude_HEADERS+= \
46 drizzled/message/statement_transform.h46 drizzled/message/statement_transform.h
@@ -89,7 +89,7 @@
89drizzled_message_schema_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}89drizzled_message_schema_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
9090
91drizzled_message_table_reader_SOURCES = drizzled/message/table_reader.cc91drizzled_message_table_reader_SOURCES = drizzled/message/table_reader.cc
92drizzled_message_table_reader_LDADD = ${MESSAGE_LDADD}92drizzled_message_table_reader_LDADD = ${BOOST_LIBS} ${MESSAGE_LDADD}
93drizzled_message_table_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}93drizzled_message_table_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
9494
95drizzled_message_table_raw_reader_SOURCES = drizzled/message/table_raw_reader.cc95drizzled_message_table_raw_reader_SOURCES = drizzled/message/table_raw_reader.cc
@@ -104,7 +104,7 @@
104drizzled_message_table_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}104drizzled_message_table_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
105105
106drizzled_message_transaction_writer_SOURCES = drizzled/message/transaction_writer.cc106drizzled_message_transaction_writer_SOURCES = drizzled/message/transaction_writer.cc
107drizzled_message_transaction_writer_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la107drizzled_message_transaction_writer_LDADD = ${BOOST_LIBS} ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la
108drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}108drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
109109
110EXTRA_DIST += \110EXTRA_DIST += \

Subscribers

People subscribed via source and target branches

to all changes: