bk commit into 5.0 tree (pem:1.1952) BUG#12712

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1952 05/09/14 10:54:02 pem@stripped +4 -0
  Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers

  sql/sql_yacc.yy
    1.424 05/09/14 10:53:55 pem@stripped +8 -9
    Post-review fix for autocommit check in SPs and triggers.

  sql/sp_head.h
    1.70 05/09/14 10:53:55 pem@stripped +2 -1
    Post-review fix for autocommit check in SPs and triggers.

  mysql-test/t/sp.test
    1.150 05/09/14 10:53:55 pem@stripped +1 -0
    Added missing drop table.

  mysql-test/r/sp.result
    1.154 05/09/14 10:53:55 pem@stripped +1 -0
    Added missing drop table.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/usr/home/pem/mysql-5.0

--- 1.423/sql/sql_yacc.yy	2005-09-14 09:42:53 +02:00
+++ 1.424/sql/sql_yacc.yy	2005-09-14 10:53:55 +02:00
@@ -8005,15 +8005,14 @@
             if (tmp == &sys_time_zone &&
                 lex->add_time_zone_tables_to_query_tables(YYTHD))
               YYABORT;
-            else
-              if (spc && tmp == &sys_autocommit)
-              {
-                /*
-                  We don't allow setting AUTOCOMMIT from a stored function
-		  or trigger.
-                */
-                lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
-              }
+            else if (spc && tmp == &sys_autocommit)
+            {
+              /*
+                We don't allow setting AUTOCOMMIT from a stored function
+		or trigger.
+              */
+              lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
+            }
 	  }
 	  else
 	  {

--- 1.153/mysql-test/r/sp.result	2005-09-13 16:54:39 +02:00
+++ 1.154/mysql-test/r/sp.result	2005-09-14 10:53:55 +02:00
@@ -3323,6 +3323,7 @@
 drop procedure bug12379_1|
 drop procedure bug12379_2|
 drop procedure bug12379_3|
+drop table t3|
 drop procedure if exists bug13124|
 create procedure bug13124()
 begin

--- 1.149/mysql-test/t/sp.test	2005-09-13 17:59:13 +02:00
+++ 1.150/mysql-test/t/sp.test	2005-09-14 10:53:55 +02:00
@@ -4161,6 +4161,7 @@
 drop procedure bug12379_1|
 drop procedure bug12379_2|
 drop procedure bug12379_3|
+drop table t3|
 
 #
 # Bug #13124    Stored Procedure using SELECT INTO crashes server

--- 1.69/sql/sp_head.h	2005-09-13 17:16:05 +02:00
+++ 1.70/sql/sp_head.h	2005-09-14 10:53:55 +02:00
@@ -285,7 +285,8 @@
       my_error(ER_SP_NO_RETSET, MYF(0), where);
     else if (m_flags & HAS_SET_AUTOCOMMIT_STMT)
       my_error(ER_SP_CANT_SET_AUTOCOMMIT, MYF(0));
-    return test(m_flags & (CONTAINS_DYNAMIC_SQL|MULTI_RESULTS));
+    return test(m_flags &
+		(CONTAINS_DYNAMIC_SQL|MULTI_RESULTS|HAS_SET_AUTOCOMMIT_STMT));
   }
 private: