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 aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge


sql/sql_insert.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-11 22:46:26 +04:00
parent 3d860b131a ec984b8c9d
commit 8907bf0af7
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/insert.result
View File

@ -299,3 +299,9 @@ select count(*) from t2;
count(*) count(*)
25500 25500
drop table t1,t2,t3; drop table t1,t2,t3;
create table t1 (n int);
create view v1 as select * from t1;
insert delayed into v1 values (1);
ERROR HY000: 'test.v1' is not BASE TABLE
drop table t1;
drop view v1;

12
mysql-test/t/insert.test
View File

@ -175,3 +175,15 @@ select count(*) from t2;
insert into t2 select t1.* from t1, t2 t, t3 where t1.id1 = t.id2 and t.id2 = t3.id3; insert into t2 select t1.* from t1, t2 t, t3 where t1.id1 = t.id2 and t.id2 = t3.id3;
select count(*) from t2; select count(*) from t2;
drop table t1,t2,t3; drop table t1,t2,t3;
#
# Test for INSERT DELAYED INTO a <view>
# BUG#13683: INSERT DELAYED into a view creates an infinite loop
#
create table t1 (n int);
create view v1 as select * from t1;
--error 1347
insert delayed into v1 values (1);
drop table t1;
drop view v1;

2
sql/sql_insert.cc
View File

@ -321,7 +321,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
if (!table_list->derived && !table_list->view) if (!table_list->derived && !table_list->view)
table_list->updatable= 1; // usual table table_list->updatable= 1; // usual table
} }
else else if (thd->net.last_errno != ER_WRONG_OBJECT)
{ {
/* Too many delayed insert threads; Use a normal insert */ /* Too many delayed insert threads; Use a normal insert */
table_list->lock_type= lock_type= TL_WRITE; table_list->lock_type= lock_type= TL_WRITE;