1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge bk@192.168.21.1:mysql-5.1-opt

into  mysql.com:/home/hf/work/26921/my51-26921
This commit is contained in:
holyfoot/hf@hfmain.(none)
2007-12-07 10:10:02 +04:00
2 changed files with 16 additions and 3 deletions

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;
}