| Index: trunk/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -608,11 +608,6 @@ |
| 609 | 609 | $this->query( "SET net_read_timeout=$timeout" ); |
| 610 | 610 | $this->query( "SET net_write_timeout=$timeout" ); |
| 611 | 611 | } |
| 612 | | - if ( isset( $options['lockTimeout'] ) ) { |
| 613 | | - $timeout = (int)$options['lockTimeout']; |
| 614 | | - $this->query( "SET table_lock_wait_timeout=$timeout" ); // table level |
| 615 | | - $this->query( "SET innodb_lock_wait_timeout=$timeout" ); // row level |
| 616 | | - } |
| 617 | 612 | } |
| 618 | 613 | |
| 619 | 614 | public function lock( $lockName, $method, $timeout = 5 ) { |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -3010,7 +3010,6 @@ |
| 3011 | 3011 | * May be useful for very long batch queries such as |
| 3012 | 3012 | * full-wiki dumps, where a single query reads out over |
| 3013 | 3013 | * hours or days. |
| 3014 | | - * 'lockTimeout' : Set the lock wait timeout value in seconds. |
| 3015 | 3014 | * |
| 3016 | 3015 | * @param $options Array |
| 3017 | 3016 | * @return void |