Index: trunk/phase3/includes/SiteStats.php |
— | — | @@ -268,9 +268,9 @@ |
269 | 269 | $sql = "UPDATE $site_stats SET $updates"; |
270 | 270 | |
271 | 271 | # Need a separate transaction because this a global lock |
272 | | - $dbw->begin(); |
| 272 | + $dbw->begin( __METHOD__ ); |
273 | 273 | $dbw->query( $sql, __METHOD__ ); |
274 | | - $dbw->commit(); |
| 274 | + $dbw->commit( __METHOD__ ); |
275 | 275 | } |
276 | 276 | } |
277 | 277 | |
Index: trunk/phase3/includes/DeferredUpdates.php |
— | — | @@ -70,7 +70,7 @@ |
71 | 71 | $update->doUpdate(); |
72 | 72 | |
73 | 73 | if ( $doCommit && $dbw->trxLevel() ) { |
74 | | - $dbw->commit(); |
| 74 | + $dbw->commit( __METHOD__ ); |
75 | 75 | } |
76 | 76 | } |
77 | 77 | |
Index: trunk/phase3/includes/db/Database.php |
— | — | @@ -836,7 +836,7 @@ |
837 | 837 | # is really used by application |
838 | 838 | $sqlstart = substr( $sql, 0, 10 ); // very much worth it, benchmark certified(tm) |
839 | 839 | if ( strpos( $sqlstart, "SHOW " ) !== 0 && strpos( $sqlstart, "SET " ) !== 0 ) |
840 | | - $this->begin(); |
| 840 | + $this->begin( __METHOD__ . " ($fname)" ); |
841 | 841 | } |
842 | 842 | |
843 | 843 | if ( $this->debug() ) { |
— | — | @@ -2742,7 +2742,7 @@ |
2743 | 2743 | */ |
2744 | 2744 | function deadlockLoop() { |
2745 | 2745 | |
2746 | | - $this->begin(); |
| 2746 | + $this->begin( __METHOD__ ); |
2747 | 2747 | $args = func_get_args(); |
2748 | 2748 | $function = array_shift( $args ); |
2749 | 2749 | $oldIgnore = $this->ignoreErrors( true ); |
Index: trunk/phase3/includes/db/LoadBalancer.php |
— | — | @@ -912,7 +912,7 @@ |
913 | 913 | } |
914 | 914 | foreach ( $conns2[$masterIndex] as $conn ) { |
915 | 915 | if ( $conn->doneWrites() ) { |
916 | | - $conn->commit(); |
| 916 | + $conn->commit( __METHOD__ ); |
917 | 917 | } |
918 | 918 | } |
919 | 919 | } |