mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
SCRUM
WL604 Privilegies in embedded library another bug fixed
This commit is contained in:
parent
9612ca5f58
commit
3f0096f9bb
1 changed files with 3 additions and 6 deletions
|
@ -2415,6 +2415,8 @@ mysql_execute_command(THD *thd)
|
||||||
|
|
||||||
if (single_table_command_access(thd, privilege, tables, &res))
|
if (single_table_command_access(thd, privilege, tables, &res))
|
||||||
goto error;
|
goto error;
|
||||||
|
#else
|
||||||
|
my_bool update=(lex->value_list.elements ? 1 : 0);
|
||||||
#endif
|
#endif
|
||||||
if (select_lex->item_list.elements != lex->value_list.elements)
|
if (select_lex->item_list.elements != lex->value_list.elements)
|
||||||
{
|
{
|
||||||
|
@ -2423,12 +2425,7 @@ mysql_execute_command(THD *thd)
|
||||||
}
|
}
|
||||||
res = mysql_insert(thd,tables,lex->field_list,lex->many_values,
|
res = mysql_insert(thd,tables,lex->field_list,lex->many_values,
|
||||||
select_lex->item_list, lex->value_list,
|
select_lex->item_list, lex->value_list,
|
||||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
(update ? DUP_UPDATE : lex->duplicates));
|
||||||
(update ? DUP_UPDATE : lex->duplicates)
|
|
||||||
#else
|
|
||||||
DUP_UPDATE
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
if (thd->net.report_error)
|
if (thd->net.report_error)
|
||||||
res= -1;
|
res= -1;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue