bk commit into 5.1 tree (lars:1.2159)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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
  1.2159 06/03/10 14:01:25 lars@stripped +3 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
  into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats

  sql/sql_parse.cc
    1.527 06/03/10 14:01:04 lars@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster_binlog.cc
    1.33 06/03/10 14:01:04 lars@stripped +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.185 06/03/10 14:01:03 lars@stripped +0 -0
    Auto merged

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-wl3023-mats/RESYNC

--- 1.184/mysql-test/t/sp.test	2006-03-09 16:04:46 +01:00
+++ 1.185/mysql-test/t/sp.test	2006-03-10 14:01:03 +01:00
@@ -2603,38 +2603,6 @@
 drop procedure bug3426|
 
 #
-# BUG#3448
-#
---disable_warnings
-create table t3 (
-  a int primary key, 
-  ach char(1)
-) engine = innodb|
-
-create table t4 (
-  b int  primary key , 
-  bch char(1)
-) engine = innodb|
---enable_warnings
-
-insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
-insert into t4 values (1 , 'bCh1' )|
-
---disable_warnings
-drop procedure if exists bug3448|
---enable_warnings
-create procedure bug3448()
-  select * from t3 inner join t4 on t3.a = t4.b|
-
-select * from t3 inner join t4 on t3.a = t4.b|
-call bug3448()|
-call bug3448()|
-
-drop procedure bug3448|
-drop table t3, t4|
-
-
-#
 # BUG#3734
 #
 create table t3 (
@@ -4859,60 +4827,6 @@
 delimiter |;
 
 #
-# BUG#14210: "Simple query with > operator on large table gives server
-# crash"
-# Check that cursors work in case when HEAP tables are converted to
-# MyISAM
-#
---disable_warnings
-drop procedure if exists bug14210|
---enable_warnings
-set @@session.max_heap_table_size=16384|
-select @@session.max_heap_table_size|
-# To trigger the memory corruption the original table must be InnoDB.
-# No harm if it's not, so don't warn if the suite is run with --skip-innodb
---disable_warnings
-create table t3 (a char(255)) engine=InnoDB|
---enable_warnings
-create procedure bug14210_fill_table()
-begin
-  declare table_size, max_table_size int default 0;
-  select @@session.max_heap_table_size into max_table_size;
-  delete from t3;
-  insert into t3 (a) values (repeat('a', 255));
-  repeat
-    insert into t3 select a from t3;
-    select count(*)*255 from t3 into table_size;
-  until table_size > max_table_size*2 end repeat;
-end|
-call bug14210_fill_table()|
-drop procedure bug14210_fill_table|
-create table t4 like t3|
-
-create procedure bug14210()
-begin
-  declare a char(255);
-  declare done int default 0;
-  declare c cursor for select * from t3;
-  declare continue handler for sqlstate '02000' set done = 1;
-  open c;
-  repeat
-    fetch c into a;
-    if not done then
-       insert into t4 values (upper(a));
-    end if;
-  until done end repeat;
-  close c;
-end|
-call bug14210()|
-select count(*) from t4|
-
-drop table t3, t4|
-drop procedure bug14210|
-set @@session.max_heap_table_size=default|
-
-
-#
 # BUG#1473: Dumping of stored functions seems to cause corruption in
 #           the function body
 #
@@ -5722,6 +5636,22 @@
 drop table t3|
 drop procedure bug16887|
 
+#
+# Bug#13575 SP funcs in select with distinct/group and order by can
+#           produce bad data
+#
+create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
+insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
+CREATE FUNCTION bug13575 ( p1 integer ) 
+returns varchar(3) 
+BEGIN 
+DECLARE v1 VARCHAR(10) DEFAULT null;
+SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 
+RETURN v1;
+END|
+select distinct f1, bug13575(f1) from t3 order by f1|
+drop function bug13575;
+drop table t3|
 
 #
 # BUG#NNNN: New bug synopsis

--- 1.32/sql/ha_ndbcluster_binlog.cc	2006-03-09 16:04:47 +01:00
+++ 1.33/sql/ha_ndbcluster_binlog.cc	2006-03-10 14:01:04 +01:00
@@ -1478,7 +1478,7 @@
 
   if (do_close_cached_tables)
     close_cached_tables((THD*) 0, 0, (TABLE_LIST*) 0);
-  return 0;
+  DBUG_RETURN(0);
 }
 
 static int