bk commit into 5.1 tree (gkodinov:1.2314)

[gkodinov]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov. When gkodinov does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-19 15:09:48+02:00, gkodinov@stripped +3 -0
  Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
  into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
  MERGE: 1.2273.102.9

  mysql-test/r/view.result@stripped, 2006-10-19 15:09:36+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.182.1.2

  mysql-test/t/view.test@stripped, 2006-10-19 15:09:36+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.165.1.2

  sql/table.cc@stripped, 2006-10-19 15:09:36+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.239.7.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/data/bk/team_tree_merge/MERGE/mysql-5.1-opt/RESYNC

--- 1.244/sql/table.cc	2006-10-19 15:09:54 +02:00
+++ 1.245/sql/table.cc	2006-10-19 15:09:54 +02:00
@@ -2787,12 +2787,13 @@
             this expression will not be moved to WHERE condition (i.e. will
             be clean correctly for PS/SP)
           */
-          tbl->on_expr= and_conds(tbl->on_expr, where);
+          tbl->on_expr= and_conds(tbl->on_expr,
+                                  where->copy_andor_structure(thd));
           break;
         }
       }
       if (tbl == 0)
-        *conds= and_conds(*conds, where);
+        *conds= and_conds(*conds, where->copy_andor_structure(thd));
       if (arena)
         thd->restore_active_arena(arena, &backup);
       where_processed= TRUE;

--- 1.183/mysql-test/r/view.result	2006-10-19 15:09:54 +02:00
+++ 1.184/mysql-test/r/view.result	2006-10-19 15:09:54 +02:00
@@ -1306,9 +1306,9 @@
 delete from t1;
 load data infile '../std_data_ln/loaddata3.dat' ignore into table v1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1264	Out of range value for column 'a' at row 3
+Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
 Error	1369	CHECK OPTION failed 'test.v1'
-Warning	1264	Out of range value for column 'a' at row 4
+Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 4
 Error	1369	CHECK OPTION failed 'test.v1'
 select * from t1 order by a,b;
 a	b

--- 1.166/mysql-test/t/view.test	2006-10-19 15:09:54 +02:00
+++ 1.167/mysql-test/t/view.test	2006-10-19 15:09:54 +02:00
@@ -347,13 +347,13 @@
 create view v4 (x,y,z) as select c+1, b, a from t1;
 create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;
 # try insert to VIEW with fields duplicate
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v3 values (-60,4,30);
 # try insert to VIEW with expression in SELECT list
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v4 values (-60,4,30);
 # try insert to VIEW using temporary table algorithm
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v5 values (-60,4,30);
 insert into v1 values (-60,4,30);
 insert into v1 (z,y,x) values (50,6,-100);
@@ -375,13 +375,13 @@
 create view v4 (x,y,z) as select c+1, b, a from t1;
 create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;
 # try insert to VIEW with fields duplicate
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v3 select c, b, a from t2;
 # try insert to VIEW with expression in SELECT list
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v4 select c, b, a from t2;
 # try insert to VIEW using temporary table algorithm
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v5 select c, b, a from t2;
 insert into v1 select c, b, a from t2;
 insert into v1 (z,y,x) select a+20,b+2,-100 from t2;
@@ -1249,14 +1249,14 @@
 #
 create table t1 (s1 smallint);
 create view v1 as select * from t1 where 20 < (select (s1) from t1);
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v1 values (30);
 create view v2 as select * from t1;
 create view v3 as select * from t1 where 20 < (select (s1) from v2);
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v3 values (30);
 create view v4 as select * from v2 where 20 < (select (s1) from t1);
--- error 1573
+-- error ER_NON_INSERTABLE_TABLE
 insert into v4 values (30);
 drop view v4, v3, v2, v1;
 drop table t1;
@@ -2860,7 +2860,7 @@
 #
 create table t1 (s1 int);
 create view v1 as select s1 as a, s1 as b from t1;
---error 1573
+--error ER_NON_INSERTABLE_TABLE
 insert into v1 values (1,1); 
 update v1 set a = 5;
 drop view v1;