Merge lp:~vlad-lesin/percona-playback/bug1021602 into lp:percona-playback

[Vlad Lesin]

Fix build errors on CentOS5.

[Stewart Smith (stewart)]

 review approve
 merge approve

--
Stewart Smith

review: Approve

=== modified file 'percona_playback/dispatcher.h'
--- percona_playback/dispatcher.h	2012-06-22 06:20:44 +0000
+++ percona_playback/dispatcher.h	2012-07-06 07:17:17 +0000
@@ -35,8 +35,7 @@
   boost::shared_ptr<DBThreadState>
     get_thread_state(uint64_t thread_id,
                      boost::function1<void, DBThread *>
-                      run_on_db_thread_create=
-                        boost::function1<void, DBThread *>());
+                      run_on_db_thread_create);
   void dispatch(QueryEntryPtr query_entry);
   bool finish_and_wait(uint64_t thread_id);
   void finish_all_and_wait();
 
=== modified file 'percona_playback/query_log/query_log.cc'
--- percona_playback/query_log/query_log.cc	2012-07-05 07:37:39 +0000
+++ percona_playback/query_log/query_log.cc	2012-07-06 07:17:17 +0000
@@ -165,7 +165,7 @@
     expected_result.setError(0);
 
     boost::posix_time::time_duration expected_duration=
-      boost::posix_time::microseconds(query_time * 1000000);
+      boost::posix_time::microseconds(long(query_time * 1000000));
     expected_result.setDuration(expected_duration);
 
     boost::posix_time::ptime start_time;