summaryrefslogtreecommitdiff
path: root/sql/parse_file.h
diff options
context:
space:
mode:
authorunknown <anozdrin@mysql.com>2006-03-28 01:01:51 +0400
committerunknown <anozdrin@mysql.com>2006-03-28 01:01:51 +0400
commite4e2e5024a3053df8a1bb788fbd6081047b72f12 (patch)
tree8c567bca738381c63383460287c6c394e64a214f /sql/parse_file.h
parentce494285fc8e22092d7521e04f161b2cbf46139a (diff)
downloadmariadb-git-e4e2e5024a3053df8a1bb788fbd6081047b72f12.tar.gz
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
in older version. The problem is that TRN-files created in "old" versions contain junk in trigger_table field, which is not acceptable in "new" versions. sql/parse_file.cc: 1. Made parse_escaped_string() available globally; 2. Polishing: fixing the comments. sql/parse_file.h: Made parse_escaped_string() available globally. sql/sql_trigger.cc: 1. Polishing 2. Removed declaration of global handle_old_incorrect_sql_modes() since it is not used anymore. 3. Added a hook to support invalid "trigger_table" field in TRN-file from old versions.
Diffstat (limited to 'sql/parse_file.h')
-rw-r--r--sql/parse_file.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/parse_file.h b/sql/parse_file.h
index 0d5a215fe1a..33871588e11 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -72,6 +72,9 @@ bool get_file_options_ulllist(char *&ptr, char *end, char *line,
gptr base, File_option *parameter,
MEM_ROOT *mem_root);
+char *
+parse_escaped_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str);
+
class File_parser;
File_parser *sql_parse_prepare(const LEX_STRING *file_name,
MEM_ROOT *mem_root, bool bad_format_errors);