Skip to content

M
MariaDB
Commit c00fb954 authored by unknown's avatar unknown
Browse files
Options

fix of error handling 


mysql-test/r/subselect.result:
  test of error handling with subselect
mysql-test/t/subselect.test:
  test of error handling with subselect
parent d06ca5c6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 20 deletions
mysql-test/r/subselect.result
View file @ c00fb954
...@@ -413,6 +413,8 @@ a b ...@@ -413,6 +413,8 @@ a b
2 12 2 12
update t1 set b= (select b from t1); update t1 set b= (select b from t1);
INSERT TABLE 't1' isn't allowed in FROM table list INSERT TABLE 't1' isn't allowed in FROM table list
update t1 set b= (select b from t2);
Subselect returns more than 1 record
update t1 set b= (select b from t2 where t1.a = t2.a); update t1 set b= (select b from t2 where t1.a = t2.a);
select * from t1; select * from t1;
a b a b
...@@ -434,6 +436,8 @@ a b ...@@ -434,6 +436,8 @@ a b
2 12 2 12
delete from t1 where b = (select b from t1); delete from t1 where b = (select b from t1);
INSERT TABLE 't1' isn't allowed in FROM table list INSERT TABLE 't1' isn't allowed in FROM table list
delete from t1 where b = (select b from t2);
Subselect returns more than 1 record
delete from t1 where b = (select b from t2 where t1.a = t2.a); delete from t1 where b = (select b from t2 where t1.a = t2.a);
select * from t1; select * from t1;
a b a b
...@@ -459,6 +463,8 @@ a b ...@@ -459,6 +463,8 @@ a b
2 12 2 12
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t12 where t11.a = t12.a); delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t12 where t11.a = t12.a);
INSERT TABLE 't12' isn't allowed in FROM table list INSERT TABLE 't12' isn't allowed in FROM table list
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2);
Subselect returns more than 1 record
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2 where t11.a = t2.a); delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2 where t11.a = t2.a);
select * from t11; select * from t11;
a b a b
...@@ -471,9 +477,13 @@ a b ...@@ -471,9 +477,13 @@ a b
drop table t11, t12, t2; drop table t11, t12, t2;
CREATE TABLE t1 (x int); CREATE TABLE t1 (x int);
create table t2 (a int); create table t2 (a int);
create table t3 (a int);
insert into t2 values (1); insert into t2 values (1);
insert into t3 values (1),(2);
INSERT INTO t1 (x) VALUES ((SELECT x FROM t1)); INSERT INTO t1 (x) VALUES ((SELECT x FROM t1));
INSERT TABLE 't1' isn't allowed in FROM table list INSERT TABLE 't1' isn't allowed in FROM table list
INSERT INTO t1 (x) VALUES ((SELECT a FROM t3));
Subselect returns more than 1 record
INSERT INTO t1 (x) VALUES ((SELECT a FROM t2)); INSERT INTO t1 (x) VALUES ((SELECT a FROM t2));
select * from t1; select * from t1;
x x
...@@ -501,14 +511,18 @@ x ...@@ -501,14 +511,18 @@ x
3 3
3 3
0 0
drop table t1, t2; drop table t1, t2, t3;
CREATE TABLE t1 (x int not null, y int, primary key (x)); CREATE TABLE t1 (x int not null, y int, primary key (x));
create table t2 (a int); create table t2 (a int);
create table t3 (a int);
insert into t2 values (1); insert into t2 values (1);
insert into t3 values (1),(2);
select * from t1; select * from t1;
x y x y
replace into t1 (x, y) VALUES ((SELECT x FROM t1), (SELECT a+1 FROM t2)); replace into t1 (x, y) VALUES ((SELECT x FROM t1), (SELECT a+1 FROM t2));
INSERT TABLE 't1' isn't allowed in FROM table list INSERT TABLE 't1' isn't allowed in FROM table list
replace into t1 (x, y) VALUES ((SELECT a FROM t3), (SELECT a+1 FROM t2));
Subselect returns more than 1 record
replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+1 FROM t2)); replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+1 FROM t2));
select * from t1; select * from t1;
x y x y
...@@ -533,7 +547,7 @@ x y ...@@ -533,7 +547,7 @@ x y
1 3 1 3
4 2 4 2
2 1 2 1
drop table t1, t2; drop table t1, t2, t3;
SELECT * FROM (SELECT 1) WHERE 1 IN (SELECT *); SELECT * FROM (SELECT 1) WHERE 1 IN (SELECT *);
No tables used No tables used
drop table if exists t; drop table if exists t;
...@@ -575,4 +589,8 @@ SELECT * FROM t; ...@@ -575,4 +589,8 @@ SELECT * FROM t;
id id
1 1
2 2
CREATE TABLE t1 (id int(11) default NULL, KEY id (id)) TYPE=MyISAM CHARSET=latin1;
INSERT INTO t1 values (1),(1);
UPDATE t SET id=(SELECT * FROM t1);
Subselect returns more than 1 record
drop table t; drop table t;
mysql-test/t/subselect.test
View file @ c00fb954
...@@ -247,6 +247,8 @@ insert into t2 values (1, 21),(2, 22),(3, 23); ...@@ -247,6 +247,8 @@ insert into t2 values (1, 21),(2, 22),(3, 23);
select * from t1; select * from t1;
-- error 1093 -- error 1093
update t1 set b= (select b from t1); update t1 set b= (select b from t1);
-- error 1240
update t1 set b= (select b from t2);
update t1 set b= (select b from t2 where t1.a = t2.a); update t1 set b= (select b from t2 where t1.a = t2.a);
select * from t1; select * from t1;
drop table t1, t2; drop table t1, t2;
...@@ -260,6 +262,8 @@ select * from t1; ...@@ -260,6 +262,8 @@ select * from t1;
select * from t1 where b = (select b from t2 where t1.a = t2.a); select * from t1 where b = (select b from t2 where t1.a = t2.a);
-- error 1093 -- error 1093
delete from t1 where b = (select b from t1); delete from t1 where b = (select b from t1);
-- error 1240
delete from t1 where b = (select b from t2);
delete from t1 where b = (select b from t2 where t1.a = t2.a); delete from t1 where b = (select b from t2 where t1.a = t2.a);
select * from t1; select * from t1;
drop table t1, t2; drop table t1, t2;
...@@ -276,6 +280,8 @@ select * from t11; ...@@ -276,6 +280,8 @@ select * from t11;
select * from t12; select * from t12;
-- error 1093 -- error 1093
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t12 where t11.a = t12.a); delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t12 where t11.a = t12.a);
-- error 1240
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2);
delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2 where t11.a = t2.a); delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b = (select b from t2 where t11.a = t2.a);
select * from t11; select * from t11;
select * from t12; select * from t12;
...@@ -284,9 +290,13 @@ drop table t11, t12, t2; ...@@ -284,9 +290,13 @@ drop table t11, t12, t2;
#insert with subselects #insert with subselects
CREATE TABLE t1 (x int); CREATE TABLE t1 (x int);
create table t2 (a int); create table t2 (a int);
create table t3 (a int);
insert into t2 values (1); insert into t2 values (1);
insert into t3 values (1),(2);
-- error 1093 -- error 1093
INSERT INTO t1 (x) VALUES ((SELECT x FROM t1)); INSERT INTO t1 (x) VALUES ((SELECT x FROM t1));
-- error 1240
INSERT INTO t1 (x) VALUES ((SELECT a FROM t3));
INSERT INTO t1 (x) VALUES ((SELECT a FROM t2)); INSERT INTO t1 (x) VALUES ((SELECT a FROM t2));
select * from t1; select * from t1;
insert into t2 values (1); insert into t2 values (1);
...@@ -300,15 +310,19 @@ INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2; ...@@ -300,15 +310,19 @@ INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2)); INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
-- sleep 1 -- sleep 1
select * from t1; select * from t1;
drop table t1, t2; drop table t1, t2, t3;
#replace with subselects #replace with subselects
CREATE TABLE t1 (x int not null, y int, primary key (x)); CREATE TABLE t1 (x int not null, y int, primary key (x));
create table t2 (a int); create table t2 (a int);
create table t3 (a int);
insert into t2 values (1); insert into t2 values (1);
insert into t3 values (1),(2);
select * from t1; select * from t1;
-- error 1093 -- error 1093
replace into t1 (x, y) VALUES ((SELECT x FROM t1), (SELECT a+1 FROM t2)); replace into t1 (x, y) VALUES ((SELECT x FROM t1), (SELECT a+1 FROM t2));
-- error 1240
replace into t1 (x, y) VALUES ((SELECT a FROM t3), (SELECT a+1 FROM t2));
replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+1 FROM t2)); replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+1 FROM t2));
select * from t1; select * from t1;
replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+2 FROM t2)); replace into t1 (x, y) VALUES ((SELECT a FROM t2), (SELECT a+2 FROM t2));
...@@ -321,7 +335,7 @@ replace DELAYED into t1 (x, y) VALUES ((SELECT a+3 FROM t2), (SELECT a+1 FROM t2 ...@@ -321,7 +335,7 @@ replace DELAYED into t1 (x, y) VALUES ((SELECT a+3 FROM t2), (SELECT a+1 FROM t2
select * from t1; select * from t1;
replace LOW_PRIORITY into t1 (x, y) VALUES ((SELECT a+1 FROM t2), (SELECT a FROM t2)); replace LOW_PRIORITY into t1 (x, y) VALUES ((SELECT a+1 FROM t2), (SELECT a FROM t2));
select * from t1; select * from t1;
drop table t1, t2; drop table t1, t2, t3;
-- error 1096 -- error 1096
SELECT * FROM (SELECT 1) WHERE 1 IN (SELECT *); SELECT * FROM (SELECT 1) WHERE 1 IN (SELECT *);
...@@ -339,4 +353,8 @@ SELECT * FROM t WHERE id IN (SELECT 5 UNION SELECT 2); ...@@ -339,4 +353,8 @@ SELECT * FROM t WHERE id IN (SELECT 5 UNION SELECT 2);
-- error 1093 -- error 1093
INSERT INTO t VALUES ((SELECT * FROM t)); INSERT INTO t VALUES ((SELECT * FROM t));
SELECT * FROM t; SELECT * FROM t;
CREATE TABLE t1 (id int(11) default NULL, KEY id (id)) TYPE=MyISAM CHARSET=latin1;
INSERT INTO t1 values (1),(1);
-- error 1240
UPDATE t SET id=(SELECT * FROM t1);
drop table t; drop table t;
sql/sql_delete.cc
View file @ c00fb954
...@@ -140,9 +140,11 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, ...@@ -140,9 +140,11 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
deleted=0L; deleted=0L;
init_ftfuncs(thd, &thd->lex.select_lex, 1); init_ftfuncs(thd, &thd->lex.select_lex, 1);
thd->proc_info="updating"; thd->proc_info="updating";
while (!(error=info.read_record(&info)) && !thd->killed) while (!(error=info.read_record(&info)) && !thd->killed &&
!thd->net.report_error)
{ {
if (!(select && select->skipp_record())) // thd->net.report_error is tested to disallow delete row on error
if (!(select && select->skipp_record())&& !thd->net.report_error )
{ {
if (!(error=table->file->delete_row(table->record[0]))) if (!(error=table->file->delete_row(table->record[0])))
{ {
...@@ -205,7 +207,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, ...@@ -205,7 +207,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
thd->lock=0; thd->lock=0;
} }
delete select; delete select;
if (error >= 0) // Fatal error if (error >= 0 || thd->net.report_error)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0); send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0);
else else
{ {
......
sql/sql_insert.cc
View file @ c00fb954
...@@ -235,9 +235,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, ...@@ -235,9 +235,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
if (fields.elements || !value_count) if (fields.elements || !value_count)
{ {
restore_record(table,2); // Get empty record restore_record(table,2); // Get empty record
if (fill_record(fields,*values) || check_null_fields(thd,table)) if (fill_record(fields,*values)|| thd->net.report_error ||
check_null_fields(thd,table))
{ {
if (values_list.elements != 1) if (values_list.elements != 1 && !thd->net.report_error)
{ {
info.records++; info.records++;
continue; continue;
...@@ -252,9 +253,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, ...@@ -252,9 +253,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
restore_record(table,2); // Get empty record restore_record(table,2); // Get empty record
else else
table->record[0][0]=table->record[2][0]; // Fix delete marker table->record[0][0]=table->record[2][0]; // Fix delete marker
if (fill_record(table->field,*values)) if (fill_record(table->field,*values) || thd->net.report_error)
{ {
if (values_list.elements != 1) if (values_list.elements != 1 && ! thd->net.report_error)
{ {
info.records++; info.records++;
continue; continue;
...@@ -1349,7 +1350,7 @@ bool select_insert::send_data(List<Item> &values) ...@@ -1349,7 +1350,7 @@ bool select_insert::send_data(List<Item> &values)
fill_record(*fields,values); fill_record(*fields,values);
else else
fill_record(table->field,values); fill_record(table->field,values);
if (write_record(table,&info)) if (thd->net.report_error || write_record(table,&info))
return 1; return 1;
if (table->next_number_field) // Clear for next record if (table->next_number_field) // Clear for next record
{ {
...@@ -1463,7 +1464,7 @@ bool select_create::send_data(List<Item> &values) ...@@ -1463,7 +1464,7 @@ bool select_create::send_data(List<Item> &values)
return 0; return 0;
} }
fill_record(field,values); fill_record(field,values);
if (write_record(table,&info)) if (thd->net.report_error ||write_record(table,&info))
return 1; return 1;
if (table->next_number_field) // Clear for next record if (table->next_number_field) // Clear for next record
{ {
......
sql/sql_parse.cc
View file @ c00fb954
...@@ -1900,6 +1900,8 @@ mysql_execute_command(THD *thd) ...@@ -1900,6 +1900,8 @@ mysql_execute_command(THD *thd)
(ORDER *) select_lex->order_list.first, (ORDER *) select_lex->order_list.first,
select_lex->select_limit, select_lex->select_limit,
lex->duplicates); lex->duplicates);
if (thd->net.report_error)
res= -1;
break; break;
case SQLCOM_UPDATE_MULTI: case SQLCOM_UPDATE_MULTI:
if (check_access(thd,UPDATE_ACL,tables->db,&tables->grant.privilege)) if (check_access(thd,UPDATE_ACL,tables->db,&tables->grant.privilege))
...@@ -1959,6 +1961,8 @@ mysql_execute_command(THD *thd) ...@@ -1959,6 +1961,8 @@ mysql_execute_command(THD *thd)
SELECT_NO_JOIN_CACHE, SELECT_NO_JOIN_CACHE,
result, unit, select_lex, 0); result, unit, select_lex, 0);
delete result; delete result;
if (thd->net.report_error)
res= -1;
} }
else else
res= -1; // Error is not sent res= -1; // Error is not sent
...@@ -1976,6 +1980,8 @@ mysql_execute_command(THD *thd) ...@@ -1976,6 +1980,8 @@ mysql_execute_command(THD *thd)
goto error; goto error;
res = mysql_insert(thd,tables,lex->field_list,lex->many_values, res = mysql_insert(thd,tables,lex->field_list,lex->many_values,
lex->duplicates); lex->duplicates);
if (thd->net.report_error)
res= -1;
break; break;
} }
case SQLCOM_REPLACE_SELECT: case SQLCOM_REPLACE_SELECT:
...@@ -2020,6 +2026,8 @@ mysql_execute_command(THD *thd) ...@@ -2020,6 +2026,8 @@ mysql_execute_command(THD *thd)
if ((result=new select_insert(tables->table,&lex->field_list, if ((result=new select_insert(tables->table,&lex->field_list,
lex->duplicates))) lex->duplicates)))
res=handle_select(thd,lex,result); res=handle_select(thd,lex,result);
if (thd->net.report_error)
res= -1;
} }
else else
res= -1; res= -1;
...@@ -2050,6 +2058,8 @@ mysql_execute_command(THD *thd) ...@@ -2050,6 +2058,8 @@ mysql_execute_command(THD *thd)
res = mysql_delete(thd,tables, select_lex->where, res = mysql_delete(thd,tables, select_lex->where,
(ORDER*) select_lex->order_list.first, (ORDER*) select_lex->order_list.first,
select_lex->select_limit, select_lex->options); select_lex->select_limit, select_lex->options);
if (thd->net.report_error)
res= -1;
break; break;
} }
case SQLCOM_DELETE_MULTI: case SQLCOM_DELETE_MULTI:
...@@ -2122,6 +2132,8 @@ mysql_execute_command(THD *thd) ...@@ -2122,6 +2132,8 @@ mysql_execute_command(THD *thd)
select_lex->options | thd->options | select_lex->options | thd->options |
SELECT_NO_JOIN_CACHE, SELECT_NO_JOIN_CACHE,
result, unit, select_lex, 0); result, unit, select_lex, 0);
if (thd->net.report_error)
res= -1;
delete result; delete result;
} }
else else
......
sql/sql_union.cc
View file @ c00fb954
...@@ -76,7 +76,7 @@ bool select_union::send_data(List<Item> &values) ...@@ -76,7 +76,7 @@ bool select_union::send_data(List<Item> &values)
return 0; return 0;
} }
fill_record(table->field,values); fill_record(table->field,values);
if ((write_record(table,&info))) if (thd->net.report_error || write_record(table,&info))
{ {
if (thd->net.last_errno == ER_RECORD_FILE_FULL) if (thd->net.last_errno == ER_RECORD_FILE_FULL)
{ {
......
sql/sql_update.cc
View file @ c00fb954
...@@ -281,7 +281,7 @@ int mysql_update(THD *thd, ...@@ -281,7 +281,7 @@ int mysql_update(THD *thd,
if (!(select && select->skipp_record())) if (!(select && select->skipp_record()))
{ {
store_record(table,1); store_record(table,1);
if (fill_record(fields,values)) if (fill_record(fields,values) || thd->net.report_error)
break; /* purecov: inspected */ break; /* purecov: inspected */
found++; found++;
if (compare_record(table, query_id)) if (compare_record(table, query_id))
...@@ -605,7 +605,7 @@ bool multi_update::send_data(List<Item> &values) ...@@ -605,7 +605,7 @@ bool multi_update::send_data(List<Item> &values)
// Only one table being updated receives a completely different treatment // Only one table being updated receives a completely different treatment
table->status|= STATUS_UPDATED; table->status|= STATUS_UPDATED;
store_record(table,1); store_record(table,1);
if (fill_record(fields,real_values)) if (fill_record(fields,real_values) || thd->net.report_error)
return 1; return 1;
found++; found++;
if (/* compare_record(table, query_id) && */ if (/* compare_record(table, query_id) && */
...@@ -644,7 +644,8 @@ bool multi_update::send_data(List<Item> &values) ...@@ -644,7 +644,8 @@ bool multi_update::send_data(List<Item> &values)
{ {
table->status|= STATUS_UPDATED; table->status|= STATUS_UPDATED;
store_record(table,1); store_record(table,1);
if (fill_record(*fields_by_tables[0],values_by_table)) if (fill_record(*fields_by_tables[0], values_by_table) ||
thd->net.report_error)
return 1; return 1;
found++; found++;
if (/*compare_record(table, query_id) && */ if (/*compare_record(table, query_id) && */
...@@ -667,8 +668,8 @@ bool multi_update::send_data(List<Item> &values) ...@@ -667,8 +668,8 @@ bool multi_update::send_data(List<Item> &values)
table->file->ref_length, table->file->ref_length,
system_charset_info)); system_charset_info));
fill_record(tmp_tables[secure_counter]->field,values_by_table); fill_record(tmp_tables[secure_counter]->field,values_by_table);
error= write_record(tmp_tables[secure_counter], error= thd->net.report_error ||
&(infos[secure_counter])); write_record(tmp_tables[secure_counter], &(infos[secure_counter]));
if (error) if (error)
{ {
error=-1; error=-1;
...@@ -774,8 +775,10 @@ int multi_update::do_updates (bool from_send_error) ...@@ -774,8 +775,10 @@ int multi_update::do_updates (bool from_send_error)
table->status|= STATUS_UPDATED; table->status|= STATUS_UPDATED;
store_record(table,1); store_record(table,1);
local_error= (fill_record(*fields_by_tables[counter + 1],list) || local_error= (fill_record(*fields_by_tables[counter + 1],list) ||
thd->net.report_error ||
/* compare_record(table, query_id) || */ /* compare_record(table, query_id) || */
table->file->update_row(table->record[1],table->record[0])); table->file->update_row(table->record[1],
table->record[0]));
if (local_error) if (local_error)
{ {
table->file->print_error(local_error,MYF(0)); table->file->print_error(local_error,MYF(0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7