5 commits

Author	SHA1	Message	Date
lars@mysql.com	53085bb443	Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0	2005-06-07 16:48:38 +02:00
lars@mysql.com	b6402bd4e4	BUG#6883: Merge fixes	2005-06-07 16:43:43 +02:00
dlenev@brandersnatch.localdomain	270b695f59	Fix for bug #10015 "Crash in InnoDB if stored routines are used". ... We should not allow explicit or implicit transaction commits inside of stored functions or triggers (so in autocommit mode we should not do commits after execution of sub-statement). Also since we don't support nested statement transactions in 5.0, we shouldn't commit or rollback stmt transactions while we are inside stored functions or triggers. This should be fixed in later (>=5.1) releases.	2005-06-07 14:53:08 +04:00
pem@mysql.comhem.se	00c220eab5	Did some SP test style changes and added explanatory comments, ... and removed a have_innodb.inc inclusion which was left by mistake in an earlier change.	2005-03-18 14:33:46 +01:00
mysqldev@mysql.com	7d5c7f5ec6	sp.test, sp.result: ... transactional test removed sp_trans.test, sp_trans.result: new file	2005-03-17 22:15:23 +01:00