database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2002-12-01 00:17:33 +02:00
parent 0b36bbdf25 1941d9b597
commit 9fcbfc0d12
7 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -1900,6 +1900,8 @@ mysql_execute_command(THD *thd)
(ORDER *) select_lex->order_list.first,
select_lex->select_limit,
lex->duplicates);
if (thd->net.report_error)
res= -1;
break;
case SQLCOM_UPDATE_MULTI:
if (check_access(thd,UPDATE_ACL,tables->db,&tables->grant.privilege))
@@ -1959,6 +1961,8 @@ mysql_execute_command(THD *thd)
SELECT_NO_JOIN_CACHE,
result, unit, select_lex, 0);
delete result;
if (thd->net.report_error)
res= -1;
}
else
res= -1; // Error is not sent
@@ -1976,6 +1980,8 @@ mysql_execute_command(THD *thd)
goto error;
res = mysql_insert(thd,tables,lex->field_list,lex->many_values,
lex->duplicates);
if (thd->net.report_error)
res= -1;
break;
}
case SQLCOM_REPLACE_SELECT:
@@ -2020,6 +2026,8 @@ mysql_execute_command(THD *thd)
if ((result=new select_insert(tables->table,&lex->field_list,
lex->duplicates)))
res=handle_select(thd,lex,result);
if (thd->net.report_error)
res= -1;
}
else
res= -1;
@@ -2050,6 +2058,8 @@ mysql_execute_command(THD *thd)
res = mysql_delete(thd,tables, select_lex->where,
(ORDER*) select_lex->order_list.first,
select_lex->select_limit, select_lex->options);
if (thd->net.report_error)
res= -1;
break;
}
case SQLCOM_DELETE_MULTI:
@@ -2122,6 +2132,8 @@ mysql_execute_command(THD *thd)
select_lex->options | thd->options |
SELECT_NO_JOIN_CACHE,
result, unit, select_lex, 0);
if (thd->net.report_error)
res= -1;
delete result;
}
else