Skip to content

Commit 59202a2

Browse files
committed
get dbms from ctl_connection in BinLogEvent
1 parent c8f83fe commit 59202a2

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pymysqlreplication/event.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __init__(
4343
self._processed = True
4444
self.complete = True
4545
self._verify_event()
46-
self.dbms = None
46+
self.dbms = self._ctl_connection._get_dbms()
4747

4848
def _read_table_id(self):
4949
# Table ID is 6 byte
@@ -105,7 +105,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
105105
self.gno = struct.unpack("<Q", self.packet.read(8))[0]
106106
self.lt_type = self.packet.read(1)[0]
107107

108-
if self.dbms == "mysql" and self.mysql_version >= (5, 7):
108+
if self.mysql_version >= (5, 7):
109109
self.last_committed = struct.unpack("<Q", self.packet.read(8))[0]
110110
self.sequence_number = struct.unpack("<Q", self.packet.read(8))[0]
111111

@@ -368,10 +368,6 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
368368
self.binlog_version = struct.unpack("<H", self.packet.read(2))
369369
self.mysql_version_str = self.packet.read(50).rstrip(b"\0").decode()
370370
numbers = self.mysql_version_str.split("-")[0]
371-
if "MariaDB" in self.mysql_version_str:
372-
self.dbms = "mariadb"
373-
else:
374-
self.dbms = "mysql"
375371
self.mysql_version = tuple(map(int, numbers.split(".")))
376372
self.created = struct.unpack("<I", self.packet.read(4))[0]
377373
self.common_header_len = struct.unpack("<B", self.packet.read(1))[0]

pymysqlreplication/row_event.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
782782
self.column_count = self.packet.read_length_coded_binary()
783783

784784
self.columns = []
785-
self.dbms = self._ctl_connection._get_dbms()
785+
self.dbms = self.dbms or self._ctl_connection._get_dbms()
786786
# Read columns meta data
787787
column_types = bytearray(self.packet.read(self.column_count))
788788
self.packet.read_length_coded_binary()

0 commit comments

Comments
 (0)