my-movies

Merge lp:~greenlion/my-movies/my-movies into lp:my-movies

  1. my-movies
  2. Merge into trunk
Proposed by Swany
Status: Needs review
Proposed branch: lp:~greenlion/my-movies/my-movies
Merge into: lp:my-movies
Diff against target: 21 lines (+3/-3)
1 file modified
lib/instrumentation.php (+3/-3)
To merge this branch: bzr merge lp:~greenlion/my-movies/my-movies
Reviewer Review Type Date Requested Status
Swany (community) Approve
Review via email: mp+113131@code.launchpad.net

Description of the change

Fixed a problem where SQL comments are not added to SQL statements.

To post a comment you must log in.
Revision history for this message
Swany (greenlion) :
review: Approve
Reply

Unmerged revisions

6. By Swany

Fixed a problem where the SQL being emitted by the application was not properly embedded with comments.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/instrumentation.php'
2--- lib/instrumentation.php 2010-09-21 21:45:42 +0000
3+++ lib/instrumentation.php 2012-07-02 23:12:21 +0000
4@@ -534,8 +534,8 @@
5
6
7 while($retry_count < MySQL_perf::$deadlock_try_limit) {
8- $instance->increment('mysql_query_count', 1);
9- $instance->instrument_query($sql, $retry_count);
10+ $instance->increment('mysql_query_count', 1);
11+ $sql = $instance->instrument_query($sql, $retry_count);
12
13 $result = false;
14 $errno = -1;
15@@ -564,4 +564,4 @@
16 }
17 }
18
19-?>
20\ No newline at end of file
21+?>

Subscribers

People subscribed via source and target branches

to all changes: