| Index: trunk/phase3/includes/Profiling.php |
| — | — | @@ -325,6 +325,7 @@ |
| 326 | 326 | $dbw = & wfGetDB(DB_MASTER); |
| 327 | 327 | if (!is_object($dbw)) |
| 328 | 328 | return false; |
| | 329 | + $errorState = $dbw->ignoreErrors( true ); |
| 329 | 330 | $profiling = $dbw->tableName('profiling'); |
| 330 | 331 | |
| 331 | 332 | $name = substr($name, 0, 255); |
| — | — | @@ -343,6 +344,7 @@ |
| 344 | 345 | // "ON DUPLICATE KEY UPDATE ". |
| 345 | 346 | // "pf_count=pf_count + VALUES(pf_count), ". |
| 346 | 347 | // "pf_time=pf_time + VALUES(pf_time)"; |
| | 348 | + $dbw->ignoreErrors( $errorState ); |
| 347 | 349 | } |
| 348 | 350 | |
| 349 | 351 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -189,7 +189,9 @@ |
| 190 | 190 | * (bug 5796) We require MySQL >=4.0.14 |
| 191 | 191 | * Add 'EmailConfirmed' hook |
| 192 | 192 | * New findhooks.php script to find undocumented hooks. |
| | 193 | +* Silently ignore errors on profiling table update. |
| 193 | 194 | |
| | 195 | + |
| 194 | 196 | == Compatibility == |
| 195 | 197 | |
| 196 | 198 | Older PHP 4.2 and 4.1 releases are no longer supported; PHP 4 users must |