Skip to content

Commit 0c03779

Browse files
committed
Update error codes from MySQL 8.0.24
1 parent 3f7e929 commit 0c03779

File tree

9 files changed

+531
-6972
lines changed

9 files changed

+531
-6972
lines changed

lib/mysql/connector/errorcode.py

Lines changed: 381 additions & 3463 deletions
Large diffs are not rendered by default.

lib/mysql/connector/locales/eng/client_error.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
44
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License, version 2.0, as
@@ -29,14 +29,14 @@
2929
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030

3131
# This file was auto-generated.
32-
_GENERATED_ON = '2020-09-29'
33-
_MYSQL_VERSION = (8, 0, 23)
32+
_GENERATED_ON = '2021-03-05'
33+
_MYSQL_VERSION = (8, 0, 24)
3434

3535
# Start MySQL Error messages
3636
CR_UNKNOWN_ERROR = u"Unknown MySQL error"
3737
CR_SOCKET_CREATE_ERROR = u"Can't create UNIX socket (%s)"
3838
CR_CONNECTION_ERROR = u"Can't connect to local MySQL server through socket '%-.100s' (%s)"
39-
CR_CONN_HOST_ERROR = u"Can't connect to MySQL server on '%-.100s' (%s)"
39+
CR_CONN_HOST_ERROR = u"Can't connect to MySQL server on '%-.100s:%u' (%s)"
4040
CR_IPSOCK_ERROR = u"Can't create TCP/IP socket (%s)"
4141
CR_UNKNOWN_HOST = u"Unknown MySQL server host '%-.100s' (%s)"
4242
CR_SERVER_GONE_ERROR = u"MySQL server has gone away"
@@ -55,10 +55,10 @@
5555
CR_CANT_READ_CHARSET = u"Can't initialize character set %-.32s (path: %-.100s)"
5656
CR_NET_PACKET_TOO_LARGE = u"Got packet bigger than 'max_allowed_packet' bytes"
5757
CR_EMBEDDED_CONNECTION = u"Embedded server"
58-
CR_PROBE_REPLICA_STATUS = u"Error on SHOW REPLICA STATUS:"
59-
CR_PROBE_REPLICA_HOSTS = u"Error on SHOW REPLICA HOSTS:"
60-
CR_PROBE_REPLICA_CONNECT = u"Error connecting to replica:"
61-
CR_PROBE_SOURCE_CONNECT = u"Error connecting to source:"
58+
CR_PROBE_SLAVE_STATUS = u"Error on SHOW SLAVE STATUS:"
59+
CR_PROBE_SLAVE_HOSTS = u"Error on SHOW SLAVE HOSTS:"
60+
CR_PROBE_SLAVE_CONNECT = u"Error connecting to slave:"
61+
CR_PROBE_MASTER_CONNECT = u"Error connecting to master:"
6262
CR_SSL_CONNECTION_ERROR = u"SSL connection error: %-.100s"
6363
CR_MALFORMED_PACKET = u"Malformed packet"
6464
CR_WRONG_LICENSE = u"This client library is licensed only for use with MySQL servers having '%s' license"

lib/mysql/connector/network.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,11 @@ def open_connection(self):
574574
self.sock.connect(sockaddr)
575575
except IOError as err:
576576
raise errors.InterfaceError(
577-
errno=2003, values=(self.get_address(), _strioerror(err)))
577+
errno=2003, values=(
578+
self.server_host,
579+
self.server_port,
580+
_strioerror(err),
581+
)
582+
)
578583
except Exception as err:
579584
raise errors.OperationalError(str(err))

0 commit comments

Comments
 (0)