database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into myvenu.com:/home/venu/bk/src-4.1
This commit is contained in:
venu@myvenu.com
2003-01-18 11:59:36 -08:00
parent 46ec0c5d33 a39da98d0d
commit 082f7c9bda
6 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libmysql/libmysql.c
View File

@ -3858,8 +3858,8 @@ static my_bool read_prepare_result(MYSQL_STMT *stmt)
}
if (!(stmt->params= (MYSQL_BIND *) alloc_root(&stmt->mem_root,
sizeof(MYSQL_BIND)*
(stmt->param_count +
field_count))))
(param_count +
field_count))))
{
set_stmt_error(stmt, CR_OUT_OF_MEMORY);
DBUG_RETURN(0);
@ -5164,3 +5164,36 @@ my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode)
DBUG_RETURN((my_bool) mysql_real_query(mysql, "set autocommit=1", 16));
DBUG_RETURN((my_bool) mysql_real_query(mysql, "set autocommit=0", 16));
}
/********************************************************************
Multi query execution related implementations
*********************************************************************/
/*
Returns if there are any more query results exists to be read using
mysql_next_result()
*/
my_bool STDCALL mysql_more_results(MYSQL *mysql)
{
if (mysql->last_used_con->server_status & SERVER_MORE_RESULTS_EXISTS)
return 1;
return 0;
}
/*
Reads and returns the next query results
*/
my_bool STDCALL mysql_next_result(MYSQL *mysql)
{
mysql->net.last_error[0]=0;
mysql->net.last_errno=0;
mysql->affected_rows= ~(my_ulonglong) 0;
if (mysql->last_used_con->server_status & SERVER_MORE_RESULTS_EXISTS)
return mysql_read_query_result(mysql);
return 0;
}