List:Internals« Previous MessageNext Message »
From:sinisa Date:March 8 2005 10:09pm
Subject:bk commit into 5.0 tree (Sinisa:1.1819)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1819 05/03/09 00:09:18 Sinisa@stripped +2 -0
  Fixing post-merge errors

  mysql-test/t/sp.test
    1.111 05/03/09 00:08:56 Sinisa@stripped +27 -28
    Fixing post-merge errors

  mysql-test/r/sp.result
    1.117 05/03/09 00:08:56 Sinisa@stripped +22 -24
    Fixing post-merge errors

# 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/petica

--- 1.116/mysql-test/r/sp.result	Tue Mar  8 22:59:12 2005
+++ 1.117/mysql-test/r/sp.result	Wed Mar  9 00:08:56 2005
@@ -2697,30 +2697,6 @@
 call bug7992()|
 drop procedure bug7992|
 drop table t3|
-drop table t2;
-drop table t1;
-drop procedure if exists sp1;
-create table t1 (a int) engine=innodb|
-create procedure sp1 ()
-begin
-truncate table t1; insert t1 values (1); rollback;
-end
-|
-set autocommit=0;
-insert t1 values (2);
-call sp1();
-ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
-commit;
-set autocommit=1;
-select * from t1;
-a
-2
-call sp1();
-select * from t1;
-a
-1
-drop table t1;
-drop procedure sp1;
 create table t3 (
 lpitnumber int(11) default null,
 lrecordtype int(11) default null
@@ -2780,3 +2756,25 @@
 drop procedure bug8937|
 delete from t1|
 drop table t1,t2;
+drop procedure if exists sp1;
+create table t1 (a int) engine=innodb|
+create procedure sp1 ()
+begin
+truncate table t1; insert t1 values (1); rollback;
+end
+|
+set autocommit=0;
+insert t1 values (2);
+call sp1();
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+commit;
+set autocommit=1;
+select * from t1;
+a
+2
+call sp1();
+select * from t1;
+a
+1
+drop table t1;
+drop procedure sp1;

--- 1.110/mysql-test/t/sp.test	Tue Mar  8 22:59:12 2005
+++ 1.111/mysql-test/t/sp.test	Wed Mar  9 00:08:56 2005
@@ -3277,34 +3277,6 @@
 drop procedure bug7992|
 drop table t3|
 delimiter ;|
-drop table t2;
-drop table t1;
-
-#
-# BUG#8850
-#
---disable_warnings
-drop procedure if exists sp1;
---enable_warnings
-delimiter |;
-create table t1 (a int) engine=innodb|
-create procedure sp1 ()
-begin
-  truncate table t1; insert t1 values (1); rollback;
-end
-|
-delimiter ;|
-set autocommit=0;
-insert t1 values (2);
---error 1192
-call sp1();
-commit;
-set autocommit=1;
-select * from t1;
-call sp1();
-select * from t1;
-drop table t1;
-drop procedure sp1;
 
 #
 # BUG#8849: problem with insert statement with table alias's
@@ -3312,6 +3284,7 @@
 # Rolling back changes to AND/OR structure of ON and WHERE clauses  in SP
 # 
 
+delimiter |;
 create table t3 (
   lpitnumber int(11) default null,
   lrecordtype int(11) default null
@@ -3387,3 +3360,29 @@
 # practical, or create table t3, t3 etc temporarily (and drop them).
 delimiter ;|
 drop table t1,t2;
+
+#
+# BUG#8850
+#
+--disable_warnings
+drop procedure if exists sp1;
+--enable_warnings
+delimiter |;
+create table t1 (a int) engine=innodb|
+create procedure sp1 ()
+begin
+  truncate table t1; insert t1 values (1); rollback;
+end
+|
+delimiter ;|
+set autocommit=0;
+insert t1 values (2);
+--error 1192
+call sp1();
+commit;
+set autocommit=1;
+select * from t1;
+call sp1();
+select * from t1;
+drop table t1;
+drop procedure sp1;
Thread
bk commit into 5.0 tree (Sinisa:1.1819)sinisa8 Mar