mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk@192.168.21.1:mysql-5.1-opt

Browse source 
into  mysql.com:/home/hf/work/26921/my51-26921
This commit is contained in:
unknown 2007-12-07 10:22:02 +04:00
commit 8ac2abbe4f
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libmysqld/lib_sql.cc
View file

@ -243,9 +243,11 @@ static my_bool emb_read_query_result(MYSQL *mysql)
mysql->warning_count= res->embedded_info->warning_count;
mysql->server_status= res->embedded_info->server_status;
mysql->field_count= res->fields;
mysql->fields= res->embedded_info->fields_list;
mysql->affected_rows= res->embedded_info->affected_rows;
mysql->insert_id= res->embedded_info->insert_id;
if (!(mysql->fields= res->embedded_info->fields_list))
{
mysql->affected_rows= res->embedded_info->affected_rows;
mysql->insert_id= res->embedded_info->insert_id;
}
net_clear_error(&mysql->net);
mysql->info= 0;

11
tests/mysql_client_test.c
View file

@ -15883,6 +15883,8 @@ static void test_status()
Test that client gets updated value of insert_id on UPDATE that uses
LAST_INSERT_ID(expr).
select_query added to test for bug
#26921 Problem in mysql_insert_id() Embedded C API function
*/
static void test_bug21726()
{
@ -15895,6 +15897,8 @@ static void test_bug21726()
const char *update_query= "UPDATE t1 SET i= LAST_INSERT_ID(i + 1)";
int rc;
my_ulonglong insert_id;
const char *select_query= "SELECT * FROM t1";
MYSQL_RES *result;
DBUG_ENTER("test_bug21726");
myheader("test_bug21726");
@ -15911,6 +15915,13 @@ static void test_bug21726()
insert_id= mysql_insert_id(mysql);
DIE_UNLESS(insert_id == 3);
rc= mysql_query(mysql, select_query);
myquery(rc);
insert_id= mysql_insert_id(mysql);
DIE_UNLESS(insert_id == 3);
result= mysql_store_result(mysql);
mysql_free_result(result);
DBUG_VOID_RETURN;
}