bk commit into 5.0 tree (dlenev:1.1643)

[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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1643 04/10/08 15:16:03 dlenev@stripped +3 -0
  Fix for bug #5887 "Triggers with string literals cause errors"
  
  Fixed small error in new .FRM parser which caused it to handle 
  improperly escaped strings.

  sql/parse_file.cc
    1.8 04/10/08 15:16:00 dlenev@stripped +1 -0
    read_escaped_string(): We should not fail when we meet \' sequence 
    in escaped string.

  mysql-test/t/trigger.test
    1.4 04/10/08 15:16:00 dlenev@stripped +14 -0
    Added test for bug #5887 "Triggers with string literals cause errors".

  mysql-test/r/trigger.result
    1.2 04/10/08 15:16:00 dlenev@stripped +5 -0
    Added test for bug #5887 "Triggers with string literals cause 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:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0-trig

--- 1.7/sql/parse_file.cc	Thu Oct  7 02:44:11 2004
+++ 1.8/sql/parse_file.cc	Fri Oct  8 15:16:00 2004
@@ -502,6 +502,7 @@
 	break;
       case '\'':
 	*write_pos= '\'';
+        break;
       default:
 	return TRUE;
       }

--- 1.1/mysql-test/r/trigger.result	Tue Sep  7 16:29:11 2004
+++ 1.2/mysql-test/r/trigger.result	Fri Oct  8 15:16:00 2004
@@ -169,3 +169,8 @@
 create trigger trg before insert on t1 for each row set @a:=1;
 ERROR HY000: Trigger's 't1' is view or temporary table
 drop table t1;
+create table t1 (x1col char);
+create trigger tx1 before insert on t1 for each row set new.x1col = 'x';
+insert into t1 values ('y');
+drop trigger t1.tx1;
+drop table t1;

--- 1.3/mysql-test/t/trigger.test	Thu Sep  9 23:44:23 2004
+++ 1.4/mysql-test/t/trigger.test	Fri Oct  8 15:16:00 2004
@@ -193,3 +193,17 @@
 --error 1361
 create trigger trg before insert on t1 for each row set @a:=1;
 drop table t1;
+
+
+
+#
+# Tests for various trigger-related bugs
+#
+
+# Test for bug #5887 "Triggers with string literals cause errors".
+# New .FRM parser was not handling escaped strings properly.
+create table t1 (x1col char);  
+create trigger tx1 before insert on t1 for each row set new.x1col = 'x';
+insert into t1 values ('y');
+drop trigger t1.tx1;
+drop table t1;