mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
after-review changes (577 SCRUM)
sql/item.cc: typo fix sql/item.h: typo fix sql/item_cmpfunc.cc: comment sql/item_func.cc: new interface sql/item_subselect.cc: comment inserted sql/item_sum.cc: layout fixed comment inserted sql/mysql_priv.h: names changed sql/sql_base.cc: some optimization sql/sql_delete.cc: name changed sql/sql_insert.cc: name changed sql/sql_lex.h: name changed sql/sql_prepare.cc: layout fixed sql/sql_select.cc: layout fixed names changed comments inserted debugging code removed sql/sql_select.h: name changed sql/sql_union.cc: name changed layout fixed sql/sql_update.cc: name changed sql/sql_yacc.yy: typo fixed
This commit is contained in:
@@ -92,7 +92,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
|
||||
if ((select && select->check_quick(safe_update, limit)) || !limit)
|
||||
{
|
||||
delete select;
|
||||
free_ulderlayed_joins(thd, &thd->lex.select_lex);
|
||||
free_underlaid_joins(thd, &thd->lex.select_lex);
|
||||
send_ok(thd,0L);
|
||||
DBUG_RETURN(0); // Nothing to delete
|
||||
}
|
||||
@@ -104,7 +104,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
|
||||
if (safe_update && !using_limit)
|
||||
{
|
||||
delete select;
|
||||
free_ulderlayed_joins(thd, &thd->lex.select_lex);
|
||||
free_underlaid_joins(thd, &thd->lex.select_lex);
|
||||
send_error(thd,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
@@ -134,7 +134,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
|
||||
== HA_POS_ERROR)
|
||||
{
|
||||
delete select;
|
||||
free_ulderlayed_joins(thd, &thd->lex.select_lex);
|
||||
free_underlaid_joins(thd, &thd->lex.select_lex);
|
||||
DBUG_RETURN(-1); // This will force out message
|
||||
}
|
||||
}
|
||||
@@ -210,7 +210,7 @@ cleanup:
|
||||
thd->lock=0;
|
||||
}
|
||||
delete select;
|
||||
free_ulderlayed_joins(thd, &thd->lex.select_lex);
|
||||
free_underlaid_joins(thd, &thd->lex.select_lex);
|
||||
if (error >= 0 || thd->net.report_error)
|
||||
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0);
|
||||
else
|
||||
|
Reference in New Issue
Block a user