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

into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 4 insertions, 2 deletions

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 18fa7c2e374..dad24e2ace9 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -1339,14 +1339,16 @@ c
 prepare stmt1 from "update v1,t1 set v1.s1=? where t1.s1=v1.s1";
 set @arg='d';
 execute stmt1 using @arg;
+ERROR HY000: Table 't1' is read only
 select * from v1;
 s1
-d
+c
 set @arg='e';
 execute stmt1 using @arg;
+ERROR HY000: Table 't1' is read only
 select * from v1;
 s1
-e
+c
 deallocate prepare stmt1;
 drop view v1;
 drop table t1;