bk commit into 4.1 tree (1.1434)

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1434 03/01/28 15:47:30 Sinisa@xxxxxxxxxxxxxxxxxxxx +5 -0
  moving a feature from 4.1 to 5.0

  sql/sql_parse.cc
    1.256 03/01/28 15:47:26 Sinisa@xxxxxxxxxxxxxxxxxxxx +2 -1
    moving a feature from 4.1 to 5.0

  mysql-test/t/subselect.test
    1.49 03/01/28 15:47:26 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -0
    moving a feature from 4.1 to 5.0

  mysql-test/t/insert.test
    1.11 03/01/28 15:47:26 Sinisa@xxxxxxxxxxxxxxxxxxxx +0 -31
    moving a feature from 4.1 to 5.0

  mysql-test/r/subselect.result
    1.57 03/01/28 15:47:26 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -2
    moving a feature from 4.1 to 5.0

  mysql-test/r/insert.result
    1.12 03/01/28 15:47:26 Sinisa@xxxxxxxxxxxxxxxxxxxx +0 -13
    moving a feature from 4.1 to 5.0

# 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: Sinisa
# Host: sinisa.nasamreza.org
# Root: /mnt/work/mysql-4.1

--- 1.255/sql/sql_parse.cc      Mon Jan 27 20:30:48 2003
+++ 1.256/sql/sql_parse.cc      Tue Jan 28 15:47:26 2003
@@ -2264,7 +2264,8 @@
 
     if (find_real_table_in_list(tables->next, tables->db, tables->real_name))
     {
-      lex->select_lex.options |= OPTION_BUFFER_RESULT;
+      net_printf(thd,ER_UPDATE_TABLE_USED,tables->real_name);
+      DBUG_VOID_RETURN;
     }
 
     /* Skip first table, which is the table we are inserting in */

--- 1.56/mysql-test/r/subselect.result  Mon Jan 27 20:29:26 2003
+++ 1.57/mysql-test/r/subselect.result  Tue Jan 28 15:47:26 2003
@@ -578,6 +578,7 @@
 3
 3
 INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
+You can't specify target table 't1' for update in FROM clause
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
 select * from t1;
 x
@@ -585,8 +586,6 @@
 2
 3
 3
-11
-11
 0
 drop table t1, t2, t3;
 CREATE TABLE t1 (x int not null, y int, primary key (x));

--- 1.48/mysql-test/t/subselect.test    Mon Jan 27 20:29:26 2003
+++ 1.49/mysql-test/t/subselect.test    Tue Jan 28 15:47:26 2003
@@ -335,6 +335,7 @@
 select * from t1;
 INSERT INTO t1 (x) select (SELECT SUM(a)+1 FROM t2) FROM t2;
 select * from t1;
+-- error 1093
 INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
 -- sleep 1

--- 1.11/mysql-test/r/insert.result     Mon Jan 27 20:29:26 2003
+++ 1.12/mysql-test/r/insert.result     Tue Jan 28 15:47:26 2003
@@ -64,16 +64,3 @@
 create table t1 (c int);
 insert into test_$1.t1 set test_$1.t1.c = '1';
 drop database test_$1;
-use test;
-drop table if exists t1,t2,t3;
-create table t1(id1 int not null auto_increment primary key, t char(12));
-create table t2(id2 int not null, t char(12));
-create table t3(id3 int not null, t char(12), index(id3));
-select count(*) from t2;
-count(*)
-500
-insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 
= t3.id3;
-select count(*) from t2;
-count(*)
-25500
-drop table if exists t1,t2,t3;

--- 1.10/mysql-test/t/insert.test       Mon Jan 27 20:29:26 2003
+++ 1.11/mysql-test/t/insert.test       Tue Jan 28 15:47:26 2003
@@ -65,34 +65,3 @@
 create table t1 (c int);
 insert into test_$1.t1 set test_$1.t1.c = '1';
 drop database test_$1;
-use test;
---disable_warnings
-drop table if exists t1,t2,t3;
---enable_warnings
-create table t1(id1 int not null auto_increment primary key, t char(12));
-create table t2(id2 int not null, t char(12));
-create table t3(id3 int not null, t char(12), index(id3));
-disable_query_log;
-let $1 = 100;
-while ($1)
- {
-  let $2 = 5;
-  eval insert into t1(t) values ('$1'); 
-  while ($2)
-   {
-     eval insert into t2(id2,t) values ($1,'$2'); 
-     let $3 = 10;
-     while ($3)
-     {
-       eval insert into t3(id3,t) values ($1,'$2'); 
-       dec $3;
-     }
-     dec $2; 
-   }
-  dec $1;
- }
-enable_query_log;
-select count(*) from t2;
-insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 
= t3.id3;
-select count(*) from t2;
-drop table if exists t1,t2,t3;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread6710@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>