1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge 10.11 into 11.0

This commit is contained in:
Marko Mäkelä
2023-06-08 13:49:48 +03:00
140 changed files with 3872 additions and 1725 deletions

View File

@@ -47,6 +47,7 @@
#include "sql_sequence.h"
#include "mem_root_array.h"
#include <utility> // pair
#include <my_attribute.h> /* __attribute__ */
class Alter_info;
class Virtual_column_info;
@@ -1463,9 +1464,9 @@ struct handlerton
const char *query, uint query_length,
const char *db, const char *table_name);
void (*abort_transaction)(handlerton *hton, THD *bf_thd,
THD *victim_thd, my_bool signal);
int (*set_checkpoint)(handlerton *hton, const XID* xid);
void (*abort_transaction)(handlerton *hton, THD *bf_thd, THD *victim_thd,
my_bool signal) __attribute__((nonnull));
int (*set_checkpoint)(handlerton *hton, const XID *xid);
int (*get_checkpoint)(handlerton *hton, XID* xid);
/**
Check if the version of the table matches the version in the .frm