1 files changed, 5 insertions, 8 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 77db558d271..fdb17a63ba5 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1005,6 +1005,11 @@ enum option_id {
 static TYPELIB option_types={array_elements(default_options)-1,
 			     "options",default_options, NULL};
 
+const char *sql_protocol_names_lib[] =
+{ "TCP", "SOCKET", "PIPE", "MEMORY", NullS };
+TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"",
+				sql_protocol_names_lib, NULL};
+
 static int add_init_command(struct st_mysql_options *options, const char *cmd)
 {
   char *tmp;
@@ -4769,11 +4774,3 @@ mysql_get_socket(const MYSQL *mysql)
     return vio_fd(mysql->net.vio);
   return INVALID_SOCKET;
 }
-
-
-int STDCALL mysql_cancel(MYSQL *mysql)
-{
-  if (mysql->net.vio)
-	return vio_shutdown(mysql->net.vio, SHUT_RDWR);
-  return -1;
-}