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 11.4 into 11.7

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 17:51:17 +02:00
parent 4d9548876e 2719cc4925
commit 33907f9ec6
449 changed files with 6775 additions and 4292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqlbinlog.cc
View File

@@ -43,6 +43,11 @@
#include "sql_priv.h"
#include "sql_basic_types.h"
#include <atomic>
#if 0 /* FIXME: the following is broken for now */
# include "mariadb_rpl.h"
#else
enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT};
#endif
#include "log_event.h"
#include "compat56.h"
#include "sql_common.h"