mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.7' into 10.8

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-02-04 14:50:25 +01:00
commit 4fb2cb1a30
907 changed files with 20188 additions and 6217 deletions
Download patch file Download diff file Expand all files Collapse all files

15
storage/federatedx/ha_federatedx.h
View file

@ -335,7 +335,7 @@ public:
| HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS |
HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_CAN_REPAIR |
HA_PRIMARY_KEY_REQUIRED_FOR_DELETE | HA_CAN_ONLINE_BACKUPS |
HA_PARTIAL_COLUMN_READ | HA_NULL_IN_KEY);
HA_PARTIAL_COLUMN_READ | HA_NULL_IN_KEY | HA_NON_COMPARABLE_ROWID);
}
/*
This is a bitmap of flags that says how the storage engine
@ -425,6 +425,19 @@ public:
int rnd_next(uchar *buf); //required
int rnd_pos(uchar *buf, uchar *pos); //required
void position(const uchar *record); //required
/*
A ref is a pointer inside a local buffer. It is not comparable to
other ref's. This is never called as HA_NON_COMPARABLE_ROWID is set.
*/
int cmp_ref(const uchar *ref1, const uchar *ref2)
{
#ifdef NOT_YET
DBUG_ASSERT(0);
return 0;
#else
return handler::cmp_ref(ref1,ref2); /* Works if table scan is used */
#endif
}
int info(uint); //required
int extra(ha_extra_function operation);