diff options
| -rw-r--r-- | libmysql/libmysql.c | 5 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 14 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 3 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
5 files changed, 6 insertions, 19 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b1fc99ad60e..4efc3c2fd1c 100644 --- a/libmysql/libmysql.c +++ b/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); diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 5fc0a007921..2640910990e 100644 --- a/libmysqld/lib_sql.cc +++ b/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))) diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 1cb37e8252a..cb4fa104b4c 100644 --- a/libmysqld/libmysqld.c +++ b/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); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 94e2d8e4c37..e37bc7cc3f7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -306,6 +306,7 @@ int check_user(THD *thd, enum enum_server_command command, /* Send the error to the client */ net_send_error(thd); DBUG_RETURN(-1); + } } send_ok(thd); DBUG_RETURN(0); diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 04eb427b35f..b81c0aef506 100644 --- a/tests/mysql_client_test.c +++ b/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) |