mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS
flag is set. When the CLIENT_FOUND_ROWS flag is set then the server should return found number of rows independently whether they were updated or not. But this wasn't the case for the INSERT statement which always returned number of rows that were actually changed thus providing wrong info to the user. Now the select_insert::send_eof method and the mysql_insert function are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.
This commit is contained in:
@ -15623,6 +15623,69 @@ static void test_bug27876()
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Bug#28505: mysql_affected_rows() returns wrong value if CLIENT_FOUND_ROWS
|
||||
flag is set.
|
||||
*/
|
||||
static void test_bug28505()
|
||||
{
|
||||
MYSQL *l_mysql;
|
||||
my_bool error= 0;
|
||||
my_ulonglong res;
|
||||
|
||||
if (!(l_mysql= mysql_init(NULL)))
|
||||
{
|
||||
myerror("mysql_init() failed");
|
||||
DIE_UNLESS(1);
|
||||
}
|
||||
if (!(mysql_real_connect(l_mysql, opt_host, opt_user,
|
||||
opt_password, current_db, opt_port,
|
||||
opt_unix_socket, CLIENT_FOUND_ROWS)))
|
||||
{
|
||||
myerror("connection failed");
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
l_mysql->reconnect= 1;
|
||||
if (mysql_query(l_mysql, "drop table if exists t1"))
|
||||
{
|
||||
myerror(NULL);
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
if (mysql_query(l_mysql, "create table t1(f1 int primary key)"))
|
||||
{
|
||||
myerror(NULL);
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
if (mysql_query(l_mysql, "insert into t1 values(1)"))
|
||||
{
|
||||
myerror(NULL);
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
if (mysql_query(l_mysql,
|
||||
"insert into t1 values(1) on duplicate key update f1=1"))
|
||||
{
|
||||
myerror(NULL);
|
||||
error= 1;
|
||||
goto end;
|
||||
}
|
||||
res= mysql_affected_rows(l_mysql);
|
||||
if (!res)
|
||||
error= 1;
|
||||
if (mysql_query(l_mysql, "drop table t1"))
|
||||
{
|
||||
myerror(NULL);
|
||||
error= 1;
|
||||
}
|
||||
end:
|
||||
mysql_close(l_mysql);
|
||||
DIE_UNLESS(error == 0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Read and parse arguments and MySQL options from my.cnf
|
||||
*/
|
||||
@ -15904,6 +15967,7 @@ static struct my_tests_st my_tests[]= {
|
||||
{ "test_bug21635", test_bug21635 },
|
||||
{ "test_bug24179", test_bug24179 },
|
||||
{ "test_bug27876", test_bug27876 },
|
||||
{ "test_bug28505", test_bug28505 },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user