diff options
Diffstat (limited to 'dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch')
| -rw-r--r-- | dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch b/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch deleted file mode 100644 index 0b10d74020cd..000000000000 --- a/dev-db/drizzle/files/drizzle-7.2.4+boost-1.50.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: drizzle-7.2.4-alpha/client/drizzleslap.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/client/drizzleslap.cc -+++ drizzle-7.2.4-alpha/client/drizzleslap.cc -@@ -1934,7 +1934,7 @@ static void timer_thread() - boost::mutex::scoped_lock scopedLock(timer_alarm_mutex); - - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += opt_timer_length; - - (void)timer_alarm_threshold.timed_wait(scopedLock, xt); -Index: drizzle-7.2.4-alpha/configure.ac -=================================================================== ---- drizzle-7.2.4-alpha.orig/configure.ac -+++ drizzle-7.2.4-alpha/configure.ac -@@ -111,7 +111,6 @@ PANDORA_DRIZZLE_BUILD - PANDORA_HAVE_BOOST_TEST - PANDORA_HAVE_LIBSQLITE3 - -- - ######################################################################### - - -Index: drizzle-7.2.4-alpha/drizzled/drizzled.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/drizzled.cc -+++ drizzle-7.2.4-alpha/drizzled/drizzled.cc -@@ -460,7 +460,7 @@ void close_connections() - while (select_thread_in_use) - { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 2; - - for (uint32_t tmp=0 ; tmp < 10 && select_thread_in_use; tmp++) -Index: drizzle-7.2.4-alpha/drizzled/table/cache.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/table/cache.cc -+++ drizzle-7.2.4-alpha/drizzled/table/cache.cc -@@ -263,7 +263,7 @@ bool Cache::removeTable(Session& session - table::Cache::removeTable routine. - */ - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 10; - boost::mutex::scoped_lock scoped(table::Cache::mutex(), boost::adopt_lock_t()); - COND_refresh.timed_wait(scoped, xt); -Index: drizzle-7.2.4-alpha/drizzled/thr_lock.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/thr_lock.cc -+++ drizzle-7.2.4-alpha/drizzled/thr_lock.cc -@@ -170,7 +170,7 @@ static enum enum_thr_lock_result wait_fo - if (can_deadlock) - { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.sec += table_lock_wait_timeout; - if (not cond->timed_wait(scoped, xt)) - { -Index: drizzle-7.2.4-alpha/plugin/sleep/sleep.cc -=================================================================== ---- drizzle-7.2.4-alpha.orig/plugin/sleep/sleep.cc -+++ drizzle-7.2.4-alpha/plugin/sleep/sleep.cc -@@ -98,7 +98,7 @@ int64_t Item_func_sleep::val_int() - - try { - boost::xtime xt; -- xtime_get(&xt, boost::TIME_UTC); -+ xtime_get(&xt, boost::TIME_UTC_); - xt.nsec += (uint64_t)(dtime * 1000000000ULL); - session.getThread()->sleep(xt); - } -Index: drizzle-7.2.4-alpha/drizzled/message/include.am -=================================================================== ---- drizzle-7.2.4-alpha.orig/drizzled/message/include.am -+++ drizzle-7.2.4-alpha/drizzled/message/include.am -@@ -40,7 +40,7 @@ lib_LTLIBRARIES += drizzled/message/libd - 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= ${LTLIBPROTOBUF} $(GCOV_LIBS) $(BOOST_LIBS) drizzled/libcharset.la - - nobase_dist_pkginclude_HEADERS+= \ - drizzled/message/statement_transform.h |