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

Proposed by Vlad Lesin on 2012-07-06
Status: Merged
Approved by: Stewart Smith on 2012-07-09
Approved revision: 145
Merge reported by: Stewart Smith
Merged at revision: not available
Proposed branch: lp:~vlad-lesin/percona-playback/bug1021602
Merge into: lp:percona-playback
Diff against target: 26 lines (+2/-3)
2 files modified
percona_playback/dispatcher.h (+1/-2)
percona_playback/query_log/query_log.cc (+1/-1)
To merge this branch: bzr merge lp:~vlad-lesin/percona-playback/bug1021602
Reviewer Review Type Date Requested Status
Stewart Smith (community) 2012-07-06 Approve on 2012-07-09
Review via email: mp+113696@code.launchpad.net

Description of the change

Fix build errors on CentOS5.

To post a comment you must log in.
Stewart Smith (stewart) wrote :

 review approve
 merge approve

--
Stewart Smith

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'percona_playback/dispatcher.h'
2--- percona_playback/dispatcher.h 2012-06-22 06:20:44 +0000
3+++ percona_playback/dispatcher.h 2012-07-06 07:17:17 +0000
4@@ -35,8 +35,7 @@
5 boost::shared_ptr<DBThreadState>
6 get_thread_state(uint64_t thread_id,
7 boost::function1<void, DBThread *>
8- run_on_db_thread_create=
9- boost::function1<void, DBThread *>());
10+ run_on_db_thread_create);
11 void dispatch(QueryEntryPtr query_entry);
12 bool finish_and_wait(uint64_t thread_id);
13 void finish_all_and_wait();
14
15=== modified file 'percona_playback/query_log/query_log.cc'
16--- percona_playback/query_log/query_log.cc 2012-07-05 07:37:39 +0000
17+++ percona_playback/query_log/query_log.cc 2012-07-06 07:17:17 +0000
18@@ -165,7 +165,7 @@
19 expected_result.setError(0);
20
21 boost::posix_time::time_duration expected_duration=
22- boost::posix_time::microseconds(query_time * 1000000);
23+ boost::posix_time::microseconds(long(query_time * 1000000));
24 expected_result.setDuration(expected_duration);
25
26 boost::posix_time::ptime start_time;

Subscribers

People subscribed via source and target branches

to all changes: