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

Merge remote-tracking branch 'origin/10.3' into 10.4

Browse Source
This commit is contained in:
Alexander Barkov
2018-06-05 10:50:08 +04:00
parent 8760acdda8 106f0b5798
commit ab297744b7
58 changed files with 433 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -3709,8 +3709,7 @@ mysql_execute_command(THD *thd)
Item **it= lex->value_list.head_ref();
if (!(*it)->basic_const_item() ||
(!(*it)->fixed && (*it)->fix_fields(lex->thd, it)) ||
(*it)->check_cols(1))
(*it)->fix_fields_if_needed_for_scalar(lex->thd, it))
{
my_message(ER_SET_CONSTANTS_ONLY, ER_THD(thd, ER_SET_CONSTANTS_ONLY),
MYF(0));
@ -3819,8 +3818,7 @@ mysql_execute_command(THD *thd)
goto error;
/* PURGE MASTER LOGS BEFORE 'data' */
it= (Item *)lex->value_list.head();
if ((!it->fixed && it->fix_fields(lex->thd, &it)) ||
it->check_cols(1))
if (it->fix_fields_if_needed_for_scalar(lex->thd, &it))
{
my_error(ER_WRONG_ARGUMENTS, MYF(0), "PURGE LOGS BEFORE");
goto error;
@ -5680,7 +5678,7 @@ end_with_restore_list:
if (lex->kill_type == KILL_TYPE_ID || lex->kill_type == KILL_TYPE_QUERY)
{
Item *it= (Item *)lex->value_list.head();
if ((!it->fixed && it->fix_fields(lex->thd, &it)) || it->check_cols(1))
if (it->fix_fields_if_needed_for_scalar(lex->thd, &it))
{
my_message(ER_SET_CONSTANTS_ONLY, ER_THD(thd, ER_SET_CONSTANTS_ONLY),
MYF(0));