Commit bac2ec3a authored by Marko Mäkelä's avatar Marko Mäkelä

After-merge fixes to the Oracle compatibility parser

The following merges changed sql_yacc.yy but not sql_yacc_ora.yy:
commit 862af4d2
commit df563e0c

Apply the same fixes to the other parser.
parent 2767cb76
......@@ -14540,9 +14540,18 @@ delete_domain_id_list:
;
delete_domain_id:
ulong_num
ulonglong_num
{
insert_dynamic(&Lex->delete_gtid_domain, (uchar*) &($1));
uint32 value= (uint32) $1;
if ($1 > UINT_MAX32)
{
my_printf_error(ER_BINLOG_CANT_DELETE_GTID_DOMAIN,
"The value of gtid domain being deleted ('%llu') "
"exceeds its maximum size "
"of 32 bit unsigned integer", MYF(0), $1);
MYSQL_YYABORT;
}
insert_dynamic(&Lex->delete_gtid_domain, (uchar*) &value);
}
;
......@@ -14717,6 +14726,7 @@ load:
lex->field_list.empty();
lex->update_list.empty();
lex->value_list.empty();
lex->many_values.empty();
}
opt_load_data_charset
{ Lex->exchange->cs= $15; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment