eric@vanth:~/src/mariadb-server$ git diff
diff --git a/sql/lex.h b/sql/lex.h
index d336c273a18..35a52e83082 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -197,6 +197,7 @@ static SYMBOL symbols[] = {
   { "DIV",             SYM(DIV_SYM)},
   { "DO",              SYM(DO_SYM)},
   { "DOUBLE",          SYM(DOUBLE_SYM)},
+  { "DOUBLE_TO_UBIGINT",SYM(DOUBLE_TO_UBIGINT)},
   { "DO_DOMAIN_IDS",    SYM(DO_DOMAIN_IDS_SYM)},
   { "DROP",            SYM(DROP)},
   { "DUAL",            SYM(DUAL_SYM)},
@@ -243,6 +244,7 @@ static SYMBOL symbols[] = {
   { "FIRST",           SYM(FIRST_SYM)},
   { "FIXED",           SYM(FIXED_SYM)},
   { "FLOAT",           SYM(FLOAT_SYM)},
+  { "FLOAT_TO_UINT",   SYM(FLOAT_TO_UINT)},
   { "FLOAT4",          SYM(FLOAT_SYM)},
   { "FLOAT8",          SYM(DOUBLE_SYM)},
   { "FLUSH",           SYM(FLUSH_SYM)},
@@ -664,6 +666,8 @@ static SYMBOL symbols[] = {
   { "TRUNCATE",                SYM(TRUNCATE_SYM)},
   { "TYPE",            SYM(TYPE_SYM)},
   { "TYPES",           SYM(TYPES_SYM)},
+  { "UBIGINT_TO_DOUBLE",SYM(UBIGINT_TO_DOUBLE_SYM)},
+  { "UINT_TO_FLOAT",   SYM(UINT_TO_FLOAT_SYM)},
   { "UNBOUNDED",        SYM(UNBOUNDED_SYM)},
   { "UNCOMMITTED",     SYM(UNCOMMITTED_SYM)},
   { "UNDEFINED",       SYM(UNDEFINED_SYM)},
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index c389b09d54c..5a509cd8413 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1314,6 +1314,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 %token  <kwd>  DISCARD
 %token  <kwd>  DISK_SYM
 %token  <kwd>  DO_SYM
+%token  <kwd>  DOUBLE_TO_UBIGINT
 %token  <kwd>  DUMPFILE
 %token  <kwd>  DUPLICATE_SYM
 %token  <kwd>  DYNAMIC_SYM                   /* SQL-2003-R */
@@ -1344,6 +1345,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 %token  <kwd>  FILE_SYM
 %token  <kwd>  FIRST_SYM                     /* SQL-2003-N */
 %token  <kwd>  FIXED_SYM
+%token  <kwd>  FLOAT_TO_UINT
 %token  <kwd>  FLUSH_SYM
 %token  <kwd>  FOLLOWS_SYM                   /* MYSQL trigger*/
 %token  <kwd>  FOLLOWING_SYM                 /* SQL-2011-N */
@@ -1611,7 +1613,9 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 %token  <kwd>  TRUNCATE_SYM
 %token  <kwd>  TYPES_SYM
 %token  <kwd>  TYPE_SYM                      /* SQL-2003-N */
+%token  <kwd>  UBIGINT_TO_DOUBLE
 %token  <kwd>  UDF_RETURNS_SYM
+%token  <kwd>  UINT_TO_FLOAT
 %token  <kwd>  UNBOUNDED_SYM                 /* SQL-2011-N */
 %token  <kwd>  UNCOMMITTED_SYM               /* SQL-2003-N */
 %token  <kwd>  UNDEFINED_SYM
eric@vanth:~/src/mariadb-server$