@@ -517,7 +517,7 @@
 unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
 const char * STDCALL mysql_character_set_name(MYSQL *mysql);
 void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *cs);
-int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
+int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname, uint charsetnr);
 
 my_bool mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *arg, ...);
 my_bool STDCALL mariadb_get_info(MYSQL *mysql, enum mariadb_value value, void *arg);
@@ -536,6 +536,7 @@
 					   const char *unix_socket,
 					   unsigned long clientflag);
 void		STDCALL mysql_close(MYSQL *sock);
+void		STDCALL mysql_close_no_command(MYSQL *sock);
 int		STDCALL mysql_select_db(MYSQL *mysql, const char *db);
 int		STDCALL mysql_query(MYSQL *mysql, const char *q);
 int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
@@ -635,7 +636,7 @@
 int STDCALL mysql_stmt_next_result_cont(int *ret, MYSQL_STMT *stmt, int status);
 
 int STDCALL mysql_set_character_set_start(int *ret, MYSQL *mysql,
-                                                   const char *csname);
+                                                   const char *csname, uint charsetnr);
 int STDCALL mysql_set_character_set_cont(int *ret, MYSQL *mysql,
                                                   int status);
 int STDCALL mysql_change_user_start(my_bool *ret, MYSQL *mysql,
@@ -752,7 +752,7 @@
   unsigned long (STDCALL *mysql_thread_id)(MYSQL *mysql);
   const char * (STDCALL *mysql_character_set_name)(MYSQL *mysql);
   void (STDCALL *mysql_get_character_set_info)(MYSQL *mysql, MY_CHARSET_INFO *cs);
-  int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname);
+  int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname, uint charsetnr);
   my_bool (*mariadb_get_infov)(MYSQL *mysql, enum mariadb_value value, void *arg, ...);
   my_bool (STDCALL *mariadb_get_info)(MYSQL *mysql, enum mariadb_value value, void *arg);
   MYSQL * (STDCALL *mysql_init)(MYSQL *mysql);
