Merge branch 'merge-perfschema-5.6' into 10.0

5.6.26

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index 3584dd60c62..3b2d37cfd12 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -56,6 +56,7 @@ int tok_row_single_value= 0;
 int tok_row_single_value_list= 0;
 int tok_row_multiple_value= 0;
 int tok_row_multiple_value_list= 0;
+int tok_ident= 0;
 int tok_unused= 0;
 
 void set_token(int tok, const char *str)
@@ -213,6 +214,10 @@ void compute_tokens()
   set_token(tok_row_multiple_value_list, "(...) /* , ... */");
 
   max_token_seen++;
+  tok_ident= max_token_seen;
+  set_token(tok_ident, "(tok_id)");
+
+  max_token_seen++;
   tok_unused= max_token_seen;
   set_token(tok_unused, "UNUSED");
 
@@ -323,6 +328,7 @@ void print_tokens()
   printf("#define TOK_ROW_SINGLE_VALUE_LIST %d\n", tok_row_single_value_list);
   printf("#define TOK_ROW_MULTIPLE_VALUE %d\n", tok_row_multiple_value);
   printf("#define TOK_ROW_MULTIPLE_VALUE_LIST %d\n", tok_row_multiple_value_list);
+  printf("#define TOK_IDENT %d\n", tok_ident);
   printf("#define TOK_UNUSED %d\n", tok_unused);
 }