database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
This commit is contained in:
kostja@bodhi.local
2006-11-29 02:39:17 +03:00
parent 08e0e06eab 21daae583d
commit bf3fbb44ae
11 changed files with 279 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libmysqld/lib_sql.cc
View File

@ -224,20 +224,24 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
{
DBUG_ENTER("emb_stmt_execute");
char header[4];
my_bool res;
int4store(header, stmt->stmt_id);
THD *thd= (THD*)stmt->mysql->thd;
thd->client_param_count= stmt->param_count;
thd->client_params= stmt->params;
if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,
header, sizeof(header), 1, stmt) ||
emb_mysql_read_query_result(stmt->mysql))
res= test(emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,
header, sizeof(header), 1, stmt) ||
emb_mysql_read_query_result(stmt->mysql));
stmt->affected_rows= stmt->mysql->affected_rows;
stmt->insert_id= stmt->mysql->insert_id;
if (res)
{
NET *net= &stmt->mysql->net;
set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
DBUG_RETURN(1);
}
stmt->affected_rows= stmt->mysql->affected_rows;
stmt->insert_id= stmt->mysql->insert_id;
DBUG_RETURN(0);
}