| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -1931,7 +1931,8 @@ |
| 1932 | 1932 | $res = $this->query( 'SHOW SLAVE STATUS', 'Database::getSlavePos' ); |
| 1933 | 1933 | $row = $this->fetchObject( $res ); |
| 1934 | 1934 | if ( $row ) { |
| 1935 | | - return new MySQLMasterPos( $row->Relay_Master_Log_File, $row->Exec_master_log_pos ); |
| | 1935 | + $pos = isset($row->Exec_master_log_pos) ? $row->Exec_master_log_pos : $row->Exec_Master_Log_Pos; |
| | 1936 | + return new MySQLMasterPos( $row->Relay_Master_Log_File, $pos ); |
| 1936 | 1937 | } else { |
| 1937 | 1938 | return false; |
| 1938 | 1939 | } |