database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-01 11:39:38 +03:00
parent 5727d56260 9c7a456a92
commit a722ee88f3
82 changed files with 1758 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -10304,8 +10304,8 @@ bool check_host_name(LEX_CSTRING *str)
}
extern int MYSQLparse(THD *thd); // from sql_yacc.cc
extern int ORAparse(THD *thd); // from sql_yacc_ora.cc
extern int MYSQLparse(THD *thd); // from yy_mariadb.cc
extern int ORAparse(THD *thd); // from yy_oracle.cc
/**