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

[Swany]

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

[Swany (greenlion)]

review: Approve

Unmerged revisions

6. By Swany on 2012-07-02

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

=== modified file 'lib/instrumentation.php'
--- lib/instrumentation.php	2010-09-21 21:45:42 +0000
+++ lib/instrumentation.php	2012-07-02 23:12:21 +0000
@@ -534,8 +534,8 @@
 
         
 		while($retry_count < MySQL_perf::$deadlock_try_limit) {
-    		$instance->increment('mysql_query_count', 1);
-    		$instance->instrument_query($sql, $retry_count);
+    			$instance->increment('mysql_query_count', 1);
+    			$sql = $instance->instrument_query($sql, $retry_count);
 			
 			$result = false;
 			$errno = -1;
@@ -564,4 +564,4 @@
     }	
 }
 
-?>
 \ No newline at end of file
+?>