| Index: branches/REL1_18/phase3/includes/db/Database.php |
| — | — | @@ -1712,9 +1712,6 @@ |
| 1713 | 1713 | } elseif ( $value === null ) { |
| 1714 | 1714 | if ( $mode == LIST_AND || $mode == LIST_OR ) { |
| 1715 | 1715 | $list .= "$field IS "; |
| 1716 | | - if ( $not ) { |
| 1717 | | - $list .= "NOT "; |
| 1718 | | - } |
| 1719 | 1716 | } elseif ( $mode == LIST_SET ) { |
| 1720 | 1717 | $list .= "$field = "; |
| 1721 | 1718 | } |
| — | — | @@ -2840,8 +2837,8 @@ |
| 2841 | 2838 | /** |
| 2842 | 2839 | * Get slave lag. Currently supported only by MySQL. |
| 2843 | 2840 | * |
| 2844 | | - * Note that this function will generate a fatal error on many |
| 2845 | | - * installations. Most callers should use LoadBalancer::safeGetLag() |
| | 2841 | + * Note that this function will generate a fatal error on many |
| | 2842 | + * installations. Most callers should use LoadBalancer::safeGetLag() |
| 2846 | 2843 | * instead. |
| 2847 | 2844 | * |
| 2848 | 2845 | * @return Database replication lag in seconds |
| Property changes on: branches/REL1_18/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2849 | 2846 | Merged /trunk/includes/db/Database.php:r96950 |
| 2850 | 2847 | Merged /trunk/phase3/includes/db/Database.php:r96950 |