Merge lp://staging/~stewart/percona-playback/cassert-header into lp://staging/~percona-dev/percona-playback/light

Proposed by Stewart Smith
Status: Merged
Merged at revision: 121
Proposed branch: lp://staging/~stewart/percona-playback/cassert-header
Merge into: lp://staging/~percona-dev/percona-playback/light
Prerequisite: lp://staging/~stewart/percona-playback/remove-null-deref
Diff against target: 628 lines (+80/-74)
12 files modified
src/common.h (+10/-12)
src/long_string.cc (+4/-3)
src/long_string.h (+2/-1)
src/mysql_client.cc (+6/-5)
src/options.cc (+2/-1)
src/query.cc (+7/-9)
src/queue.h (+26/-25)
src/reader.cc (+2/-1)
src/sheduler.cc (+8/-7)
src/slow_query_log_parser.h (+2/-1)
src/supervisor.cc (+6/-5)
src/worker.cc (+5/-4)
To merge this branch: bzr merge lp://staging/~stewart/percona-playback/cassert-header
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+67501@code.staging.launchpad.net

Description of the change

correctly include the cassert header for assert() and also use standard assert() instead of custom ASSERT(). If people really want to not run the asserts, they can change this via compile option (which, IMNSHO is silly to do)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches