merging

libmysql/libmysql.c

@@ -2699,7 +2699,8 @@ stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row)
     int4store(buff, stmt->stmt_id);
     int4store(buff + 4, stmt->prefetch_rows); /* number of rows to fetch */
     if ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,
-                                            buff, sizeof(buff), NullS, 0, 1))
+                                            buff, sizeof(buff), NullS, 0,
+                                            1, NULL))
     {
       set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
       return 1;
@@ -4948,7 +4949,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
         char buff[MYSQL_STMT_HEADER]; /* packet header: 4 bytes for stmt id */
         int4store(buff, stmt->stmt_id);
         if ((*mysql->methods->advanced_command)(mysql, COM_STMT_RESET, buff,
-                                                sizeof(buff), 0, 0, 0))
+                                                sizeof(buff), 0, 0, 0, NULL))
         {
           set_stmt_errmsg(stmt, mysql->net.last_error, mysql->net.last_errno,
                           mysql->net.sqlstate);

libmysqld/lib_sql.cc

@@ -387,20 +387,6 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql)
   return mysql_store_result(mysql);
 }
 
-my_bool emb_next_result(MYSQL *mysql)
-{
-  THD *thd= (THD*)mysql->thd;
-  DBUG_ENTER("emb_next_result");
-
-  if (emb_advanced_command(mysql, COM_QUERY,0,0,
-			   thd->query_rest.ptr(),thd->query_rest.length(),
-                           1, NULL) ||
-      emb_mysql_read_query_result(mysql))
-    DBUG_RETURN(1);
-
-  DBUG_RETURN(0);				/* No more results */
-}
-
 int emb_read_change_user_result(MYSQL *mysql, 
 				char *buff __attribute__((unused)),
 				const char *passwd __attribute__((unused)))

libmysqld/libmysqld.c

@@ -164,7 +164,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 
   port=0;
   unix_socket=0;
-  db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL;
 
   /* Send client information for access check */
   client_flag|=CLIENT_CAPABILITIES;
@@ -175,7 +174,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
     client_flag|=CLIENT_CONNECT_WITH_DB;
 
   mysql->info_buffer= my_malloc(MYSQL_ERRMSG_SIZE, MYF(0));
-  mysql->thd= create_embedded_thd(client_flag, db_name);
+  mysql->thd= create_embedded_thd(client_flag);
 
   init_embedded_mysql(mysql, client_flag);
 

sql/sql_parse.cc

@@ -307,6 +307,7 @@ int check_user(THD *thd, enum enum_server_command command,
       net_send_error(thd);
       DBUG_RETURN(-1);
     }
+  }
   send_ok(thd);
   DBUG_RETURN(0);
 #else

tests/mysql_client_test.c

@@ -13100,7 +13100,7 @@ static void test_bug9478()
       int4store(buff, stmt->stmt_id);
       buff[4]= 1;                               /* prefetch rows */
       rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff,
-                                               sizeof(buff), 0,0,1) ||
+                                               sizeof(buff), 0,0,1,NULL) ||
            (*mysql->methods->read_query_result)(mysql));
       DIE_UNLESS(rc);
       if (!opt_silent && i == 0)