summaryrefslogtreecommitdiff
path: root/sql/parse_file.cc
diff options
context:
space:
mode:
authorunknown <dlenev@brandersnatch.localdomain>2004-10-08 15:16:03 +0400
committerunknown <dlenev@brandersnatch.localdomain>2004-10-08 15:16:03 +0400
commit79f1eeb87ff8047d1d09578f41c604bf5e31f29b (patch)
treef77a777a10891cf8f8877a9e08f960f2a20da543 /sql/parse_file.cc
parent1af88dc5f46a87d515f68b181a0c51cea9168364 (diff)
downloadmariadb-git-79f1eeb87ff8047d1d09578f41c604bf5e31f29b.tar.gz
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. mysql-test/r/trigger.result: Added test for bug #5887 "Triggers with string literals cause errors". mysql-test/t/trigger.test: Added test for bug #5887 "Triggers with string literals cause errors". sql/parse_file.cc: read_escaped_string(): We should not fail when we meet \' sequence in escaped string.
Diffstat (limited to 'sql/parse_file.cc')
-rw-r--r--sql/parse_file.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 16674793b48..f548c16d808 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -502,6 +502,7 @@ read_escaped_string(char *ptr, char *eol, LEX_STRING *str)
break;
case '\'':
*write_pos= '\'';
+ break;
default:
return TRUE;
}