Skip to content

fix #115 for mysql 8.4.0 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

fix #115 for mysql 8.4.0 #116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1d794b4
fix #115 for mysql 8.0.0
hetao29 May 5, 2024
c5b38e5
fix #115 for mysql 8.4.0
hetao29 May 5, 2024
6ca015c
fix #115 for mysql 8.4.0 phpunit test
hetao29 May 8, 2024
bee8f75
Merge branch 'krowinski:master' into master
hetao29 Aug 30, 2024
418625f
fix issue #125
hetao29 Aug 30, 2024
bb27b5d
Merge branch 'master' of github.com:hetao29/php-mysql-replication
hetao29 Aug 30, 2024
0c31198
change to hetao29
hetao29 Aug 30, 2024
2a372a7
Merge branch 'krowinski:master' into master
hetao29 Feb 17, 2025
f0fa732
Fix PHP 8.4 deprecation: Implicitly marking parameter as nullable is …
hetao29 Feb 17, 2025
2e87e3c
fix conflicts
hetao29 Apr 21, 2025
c310edb
Merge branch 'krowinski-master'
hetao29 Apr 21, 2025
09abaf4
change to krowinski
hetao29 Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/MySQLReplication/BinLog/BinLogSocketConnect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,14 @@ private function getBinlogStream(): void
$this->executeSQL('SET @master_binlog_checksum = @@global.binlog_checksum');
}


if ($this->config->heartbeatPeriod > 0.00) {
// master_heartbeat_period is in nanoseconds
$this->executeSQL('SET @master_heartbeat_period = ' . $this->config->heartbeatPeriod * 1000000000);
if(version_compare($this->repository->getVersion(),"8.4.0")>=0){
$this->executeSQL('SET @source_heartbeat_period = ' . $this->config->heartbeatPeriod * 1000000000);
}else{
$this->executeSQL('SET @master_heartbeat_period = ' . $this->config->heartbeatPeriod * 1000000000);
}

$this->logger->info('Heartbeat period set to ' . $this->config->heartbeatPeriod . ' seconds');
}
Expand Down
20 changes: 10 additions & 10 deletions src/MySQLReplication/Repository/MySQLRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ public function isCheckSum(): bool

public function getVersion(): string
{
$r = '';
$versions = $this->getConnection()
->fetchAllAssociative('SHOW VARIABLES LIKE "version%"');

foreach ($versions as $version) {
$r .= $version['Value'];
}
$res = $this->getConnection()
->fetchAssociative('SHOW VARIABLES LIKE "version"');

return $r;
return $res['Value']??"";
}

public function getMasterStatus(): MasterStatusDTO
{
$data = $this->getConnection()
->fetchAssociative('SHOW MASTER STATUS');
if(version_compare($this->getVersion(),"8.4.0")>=0){
$data = $this->getConnection()
->fetchAssociative('SHOW BINARY LOG STATUS');
}else{
$data = $this->getConnection()
->fetchAssociative('SHOW MASTER STATUS');
}
if (empty($data)) {
throw new BinLogException(
MySQLReplicationException::BINLOG_NOT_ENABLED,
Expand Down