bk commit into 5.0 tree (dlenev:1.2020)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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.2020 06/01/31 14:43:41 dlenev@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829

  mysql-test/t/trigger.test
    1.34 06/01/31 14:43:34 dlenev@stripped +0 -0
    Auto merged

  mysql-test/r/trigger.result
    1.29 06/01/31 14:43:34 dlenev@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:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.0-bg16829/RESYNC

--- 1.28/mysql-test/r/trigger.result	2006-01-24 10:36:39 +03:00
+++ 1.29/mysql-test/r/trigger.result	2006-01-31 14:43:34 +03:00
@@ -785,3 +785,8 @@
 ERROR 3D000: No database selected
 drop trigger t1_bi;
 ERROR 3D000: No database selected
+create table t1 (i int);
+create trigger t1_bi before insert on t1 for each row return 0;
+ERROR 42000: RETURN is only allowed in a FUNCTION
+insert into t1 values (1);
+drop table t1;

--- 1.33/mysql-test/t/trigger.test	2006-01-24 10:36:39 +03:00
+++ 1.34/mysql-test/t/trigger.test	2006-01-31 14:43:34 +03:00
@@ -958,3 +958,12 @@
 --error ER_NO_DB_ERROR
 drop trigger t1_bi;
 connection default;
+
+# Test for bug #16829 "Firing trigger with RETURN crashes the server"
+# RETURN is not supposed to be used anywhere except functions, so error
+# should be returned when one attempts to create trigger with RETURN.
+create table t1 (i int);
+--error ER_SP_BADRETURN
+create trigger t1_bi before insert on t1 for each row return 0;
+insert into t1 values (1);
+drop table t1;