| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -226,6 +226,8 @@ |
| 227 | 227 | |
| 228 | 228 | protected $preparedArgs; |
| 229 | 229 | |
| | 230 | + protected $htmlErrors; |
| | 231 | + |
| 230 | 232 | # ------------------------------------------------------------------------------ |
| 231 | 233 | # Accessors |
| 232 | 234 | # ------------------------------------------------------------------------------ |
| — | — | @@ -621,6 +623,11 @@ |
| 622 | 624 | * Same as new DatabaseMysql( ... ), kept for backward compatibility |
| 623 | 625 | * @deprecated since 1.17 |
| 624 | 626 | * |
| | 627 | + * @param $server |
| | 628 | + * @param $user |
| | 629 | + * @param $password |
| | 630 | + * @param $dbName |
| | 631 | + * @param $flags int |
| 625 | 632 | * @return DatabaseMysql |
| 626 | 633 | */ |
| 627 | 634 | static function newFromParams( $server, $user, $password, $dbName, $flags = 0 ) { |
| — | — | @@ -692,6 +699,10 @@ |
| 693 | 700 | } |
| 694 | 701 | } |
| 695 | 702 | |
| | 703 | + /** |
| | 704 | + * @param $errno |
| | 705 | + * @param $errstr |
| | 706 | + */ |
| 696 | 707 | protected function connectionErrorHandler( $errno, $errstr ) { |
| 697 | 708 | $this->mPHPError = $errstr; |
| 698 | 709 | } |
| — | — | @@ -1542,8 +1553,10 @@ |
| 1543 | 1554 | } |
| 1544 | 1555 | |
| 1545 | 1556 | /** |
| 1546 | | - * @todo document |
| 1547 | 1557 | * mysql_field_type() wrapper |
| | 1558 | + * @param $res |
| | 1559 | + * @param $index |
| | 1560 | + * @return string |
| 1548 | 1561 | */ |
| 1549 | 1562 | function fieldType( $res, $index ) { |
| 1550 | 1563 | if ( $res instanceof ResultWrapper ) { |
| — | — | @@ -2278,6 +2291,8 @@ |
| 2279 | 2292 | * which index to pick. Anyway, other databases might have different |
| 2280 | 2293 | * indexes on a given table. So don't bother overriding this unless you're |
| 2281 | 2294 | * MySQL. |
| | 2295 | + * @param $index |
| | 2296 | + * @return string |
| 2282 | 2297 | */ |
| 2283 | 2298 | function useIndexClause( $index ) { |
| 2284 | 2299 | return ''; |