Skip to content

Commit e771f74

Browse files
committed
removed conn->greet_charset
1 parent 2f60582 commit e771f74

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed

ext/mysqlnd/mysqlnd_commands.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -642,15 +642,6 @@ MYSQLND_METHOD(mysqlnd_command, handshake)(MYSQLND_CONN_DATA * const conn, const
642642
conn->protocol_version = greet_packet.protocol_version;
643643
conn->server_version = mnd_pestrdup(greet_packet.server_version, conn->persistent);
644644

645-
conn->greet_charset = mysqlnd_find_charset_nr(greet_packet.charset_no);
646-
if (!conn->greet_charset) {
647-
char * msg;
648-
mnd_sprintf(&msg, 0, "Server sent charset (%d) unknown to the client. Please, report to the developers", greet_packet.charset_no);
649-
SET_CLIENT_ERROR(conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, msg);
650-
mnd_sprintf_free(msg);
651-
goto err;
652-
}
653-
654645
conn->server_capabilities = greet_packet.server_capabilities;
655646

656647
if (FAIL == mysqlnd_connect_run_authentication(conn, user, passwd, db, db_len, (size_t) passwd_len,

ext/mysqlnd/mysqlnd_connection.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, free_contents)(MYSQLND_CONN_DATA * conn)
302302
mysqlnd_set_string(&conn->last_message, NULL, 0);
303303

304304
conn->charset = NULL;
305-
conn->greet_charset = NULL;
306305

307306
DBG_VOID_RETURN;
308307
}

ext/mysqlnd/mysqlnd_structs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,6 @@ struct st_mysqlnd_connection_data
902902
char *host_info;
903903
MYSQLND_STRING authentication_plugin_data;
904904
const MYSQLND_CHARSET *charset;
905-
const MYSQLND_CHARSET *greet_charset;
906905
MYSQLND_STRING connect_or_select_db;
907906
MYSQLND_INFILE infile;
908907
unsigned int protocol_version;

0 commit comments

Comments
 (0)