diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 06f157eb..f7da9162 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1115,7 +1115,7 @@ mysql_real_connect(MYSQL *mysql, const char *host, const char *user,
 		   const char *passwd, const char *db,
 		   uint port, const char *unix_socket,unsigned long client_flag)
 {
-  char *end;
+  char *end= NULL;
   char *connection_handler= (mysql->options.extension) ?
                             mysql->options.extension->connection_handler : 0;
 
diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c
index 2cb5ce06..c401b641 100644
--- a/libmariadb/mariadb_stmt.c
+++ b/libmariadb/mariadb_stmt.c
@@ -1268,7 +1268,7 @@ MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql)
   /* fill mysql's stmt list */
   stmt->list.data= stmt;
   stmt->mysql= mysql;
-  stmt->stmt_id= -1;
+  stmt->stmt_id= 0;
   mysql->stmts= list_add(mysql->stmts, &stmt->list);
 
 
@@ -2119,6 +2119,7 @@ int STDCALL mariadb_stmt_execute_direct(MYSQL_STMT *stmt,
                                          sizeof(stmt_id), 1, stmt))
       goto fail;
   }
+  stmt->stmt_id= -1;
   if (mysql->methods->db_command(mysql, COM_STMT_PREPARE, stmt_str, length, 1, stmt))
     goto fail;