merge

1 files changed, 12 insertions, 2 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index c6662501cf6..3a559433e2d 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -2357,10 +2357,20 @@ struct LEX: public Query_tables_list
 
     This pointer is required to add possibly omitted DEFINER-clause to the
     DDL-statement before dumping it to the binlog.
+
+    keyword_delayed_begin_offset is the offset to the beginning of the DELAYED
+    keyword in INSERT DELAYED statement. keyword_delayed_end_offset is the
+    offset to the character right after the DELAYED keyword.
   */
-  const char *stmt_definition_begin;
+  union {
+    const char *stmt_definition_begin;
+    uint keyword_delayed_begin_offset;
+  };
 
-  const char *stmt_definition_end;
+  union {
+    const char *stmt_definition_end;
+    uint keyword_delayed_end_offset;
+  };
 
   /**
     During name resolution search only in the table list given by