diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
| commit | a722ee88f33296eee6a72855570677c48dce7ebf (patch) | |
| tree | 128ce4696a80fd953836b4a9eed20ab8afc4e61c /sql/sql_digest.cc | |
| parent | 5727d56260e66d9b9f2dee6783385c5928d4f3a3 (diff) | |
| parent | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (diff) | |
| download | mariadb-git-a722ee88f33296eee6a72855570677c48dce7ebf.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_digest.cc')
| -rw-r--r-- | sql/sql_digest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_digest.cc b/sql/sql_digest.cc index e00069366cd..36a6b398ad3 100644 --- a/sql/sql_digest.cc +++ b/sql/sql_digest.cc @@ -32,7 +32,7 @@ #include "sql_get_diagnostics.h" /* Generated code */ -#include "sql_yacc.hh" +#include "yy_mariadb.hh" #define LEX_TOKEN_WITH_DEFINITION #include "lex_token.h" |