database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

2
sql/sql_digest.cc
View File

@@ -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"