bk commit into 5.1 tree (msvensson:1.2163)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2163 06/05/18 19:26:53 msvensson@shellback.(none) +6 -0
  Move test that requires innodb to sp_trans

  mysql-test/t/sp_trans.test
    1.10 06/05/18 19:26:45 msvensson@shellback.(none) +39 -0
    Move test that requires innodb to sp_trans

  mysql-test/t/sp.test
    1.189 06/05/18 19:26:45 msvensson@shellback.(none) +0 -17
    Move test that requires innodb to sp_trans

  mysql-test/t/sp-security.test
    1.34 06/05/18 19:26:44 msvensson@shellback.(none) +0 -23
    Move test that requires innodb to sp_trans

  mysql-test/r/sp_trans.result
    1.12 06/05/18 19:26:44 msvensson@shellback.(none) +26 -0
    Move test that requires innodb to sp_trans

  mysql-test/r/sp.result
    1.205 06/05/18 19:26:44 msvensson@shellback.(none) +0 -16
    Move test that requires innodb to sp_trans

  mysql-test/r/sp-security.result
    1.33 06/05/18 19:26:44 msvensson@shellback.(none) +0 -10
    Move test that requires innodb to sp_trans

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.32/mysql-test/r/sp-security.result	2006-05-02 09:31:48 +02:00
+++ 1.33/mysql-test/r/sp-security.result	2006-05-18 19:26:44 +02:00
@@ -314,16 +314,6 @@
 ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
 drop user user_bug14533@localhost;
 drop database db_bug14533;
-CREATE DATABASE db_bug7787;
-use db_bug7787;
-CREATE PROCEDURE p1()
-SHOW INNODB STATUS;
-Warnings:
-Warning	1541	The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL
5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.
-GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost;
-DROP DATABASE db_bug7787;
-drop user user_bug7787@localhost;
-use test;
 
 ---> connection: root
 DROP DATABASE IF EXISTS mysqltest;

--- 1.204/mysql-test/r/sp.result	2006-04-25 16:09:26 +02:00
+++ 1.205/mysql-test/r/sp.result	2006-05-18 19:26:44 +02:00
@@ -4796,22 +4796,6 @@
 0
 drop table t3|
 drop procedure bug16887|
-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|
-f1	bug13575(f1)
-1	aaa
-2	bbb
-3	ccc
-drop function bug13575;
-drop table t3|
 drop procedure if exists bug16474_1|
 drop procedure if exists bug16474_2|
 delete from t1|

--- 1.33/mysql-test/t/sp-security.test	2006-05-02 09:31:48 +02:00
+++ 1.34/mysql-test/t/sp-security.test	2006-05-18 19:26:44 +02:00
@@ -527,29 +527,6 @@
 
 
 #
-# BUG#7787: Stored procedures: improper warning for "grant execute" statement
-#
-
-# Prepare.
-
-CREATE DATABASE db_bug7787;
-use db_bug7787;
-
-# Test.
-
-CREATE PROCEDURE p1()
-  SHOW INNODB STATUS; 
-
-GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost; 
-
-# Cleanup.
-
-DROP DATABASE db_bug7787;
-drop user user_bug7787@localhost;
-use test;
-
-
-#
 # WL#2897: Complete definer support in the stored routines.
 #
 # The following cases are tested:

--- 1.188/mysql-test/t/sp.test	2006-04-25 16:09:27 +02:00
+++ 1.189/mysql-test/t/sp.test	2006-05-18 19:26:45 +02:00
@@ -5637,23 +5637,6 @@
 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#16474: SP crashed MySQL
 # (when using "order by localvar", where 'localvar' is just that.
 #

--- 1.11/mysql-test/r/sp_trans.result	2006-05-17 15:05:42 +02:00
+++ 1.12/mysql-test/r/sp_trans.result	2006-05-18 19:26:44 +02:00
@@ -530,3 +530,29 @@
 drop table t3, t4|
 drop procedure bug14210|
 set @@session.max_heap_table_size=default|
+CREATE DATABASE db_bug7787|
+use db_bug7787|
+CREATE PROCEDURE p1()
+SHOW INNODB STATUS; |
+Warnings:
+Warning	1541	The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL
5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.
+GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost|
+DROP DATABASE db_bug7787|
+drop user user_bug7787@localhost|
+use test|
+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|
+f1	bug13575(f1)
+1	aaa
+2	bbb
+3	ccc
+drop function bug13575|
+drop table t3|

--- 1.9/mysql-test/t/sp_trans.test	2006-05-12 18:58:53 +02:00
+++ 1.10/mysql-test/t/sp_trans.test	2006-05-18 19:26:45 +02:00
@@ -552,6 +552,45 @@
 drop procedure bug14210|
 set @@session.max_heap_table_size=default|
 
+#
+# BUG#7787: Stored procedures: improper warning for "grant execute" statement
+#
+
+# Prepare.
+
+CREATE DATABASE db_bug7787|
+use db_bug7787|
+
+# Test.
+
+CREATE PROCEDURE p1()
+  SHOW INNODB STATUS; |
+
+GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost|
+
+# Cleanup.
+
+DROP DATABASE db_bug7787|
+drop user user_bug7787@localhost|
+use test|
+
+#
+# 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