Skip to content

Commit c8f83fe

Browse files
committed
fixed version retrieval from get_server_info
1 parent 3ae251c commit c8f83fe

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

pymysqlreplication/binlogstream.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ def __init__(
287287
else:
288288
self.pymysql_wrapper = pymysql.connect
289289
self.mysql_version = (0, 0, 0)
290+
self.dbms = None
290291

291292
def close(self):
292293
if self.__connected_stream:
@@ -748,14 +749,12 @@ def _allowed_event_list(
748749
def __get_dbms(self):
749750
if not self.__connected_ctl:
750751
self.__connect_to_ctl()
751-
752-
cur = self._ctl_connection.cursor()
753-
cur.execute("SELECT VERSION();")
754-
755-
version_info = cur.fetchone().get("VERSION()", "")
756-
757-
if "MariaDB" in version_info:
752+
if self.dbms:
753+
return self.dbms
754+
if "MariaDB" in self._ctl_connection.get_server_info():
755+
self.dbms = "mariadb"
758756
return "mariadb"
757+
self.dbms = "mysql"
759758
return "mysql"
760759

761760
def __log_valid_parameters(self):

pymysqlreplication/event.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def __init__(
2727
ignore_decode_errors=False,
2828
verify_checksum=False,
2929
optional_meta_data=False,
30-
dbms=None,
3130
):
3231
self.packet = from_packet
3332
self.table_map = table_map
@@ -44,7 +43,7 @@ def __init__(
4443
self._processed = True
4544
self.complete = True
4645
self._verify_event()
47-
self.dbms = dbms
46+
self.dbms = None
4847

4948
def _read_table_id(self):
5049
# Table ID is 6 byte

0 commit comments

Comments
 (0)