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

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-06-24 13:09:47 +03:00
commit 0076eb3d4e
333 changed files with 6732 additions and 6129 deletions
Download patch file Download diff file Expand all files Collapse all files

15
storage/mroonga/ha_mroonga.hpp
View file

@ -35,11 +35,8 @@ extern "C" {
#include <mrn_operations.hpp>
#include <mrn_database.hpp>
#if __cplusplus >= 201402
# define mrn_override override
#else
# define mrn_override
#endif
#define mrn_override override
#if (MYSQL_VERSION_ID >= 50514 && MYSQL_VERSION_ID < 50600)
# define MRN_HANDLER_HAVE_FINAL_ADD_INDEX 1
@ -455,10 +452,10 @@ public:
int update_row(const uchar *old_data, const uchar *new_data) mrn_override;
int delete_row(const uchar *buf) mrn_override;
uint max_supported_record_length() const mrn_override;
uint max_supported_keys() const mrn_override;
uint max_supported_key_parts() const mrn_override;
uint max_supported_key_length() const mrn_override;
uint max_supported_record_length() const mrn_override;
uint max_supported_keys() const mrn_override;
uint max_supported_key_parts() const mrn_override;
uint max_supported_key_length() const mrn_override;
uint max_supported_key_part_length() const mrn_override;
ha_rows records_in_range(uint inx, const key_range *min_key,

4
storage/mroonga/vendor/groonga/lib/dat/dat.hpp vendored
View file

@ -185,7 +185,7 @@ class Exception : public std::exception {
virtual int line() const throw() {
return line_;
}
virtual const char *what() const throw() {
const char *what() const throw() override {
return what_;
}
@ -206,7 +206,7 @@ class Error : public Exception {
: Exception(ex) {}
virtual ~Error() throw() = default;
virtual ErrorCode code() const throw() {
ErrorCode code() const throw() override {
return T;
}
};

10
storage/mroonga/vendor/groonga/lib/dat/id-cursor.hpp vendored
View file

@ -44,17 +44,17 @@ class GRN_DAT_API IdCursor : public Cursor {
UInt32 limit = MAX_UINT32,
UInt32 flags = 0);
void close();
void close() override;
const Key &next();
const Key &next() override;
UInt32 offset() const {
UInt32 offset() const override {
return offset_;
}
UInt32 limit() const {
UInt32 limit() const override {
return limit_;
}
UInt32 flags() const {
UInt32 flags() const override {
return flags_;
}

10
storage/mroonga/vendor/groonga/lib/dat/key-cursor.hpp vendored
View file

@ -38,17 +38,17 @@ class GRN_DAT_API KeyCursor : public Cursor {
UInt32 limit = MAX_UINT32,
UInt32 flags = 0);
void close();
void close() override;
const Key &next();
const Key &next() override;
UInt32 offset() const {
UInt32 offset() const override {
return offset_;
}
UInt32 limit() const {
UInt32 limit() const override {
return limit_;
}
UInt32 flags() const {
UInt32 flags() const override {
return flags_;
}

10
storage/mroonga/vendor/groonga/lib/dat/predictive-cursor.hpp vendored
View file

@ -37,17 +37,17 @@ class GRN_DAT_API PredictiveCursor : public Cursor {
UInt32 limit = MAX_UINT32,
UInt32 flags = 0);
void close();
void close() override;
const Key &next();
const Key &next() override;
UInt32 offset() const {
UInt32 offset() const override {
return offset_;
}
UInt32 limit() const {
UInt32 limit() const override {
return limit_;
}
UInt32 flags() const {
UInt32 flags() const override {
return flags_;
}

10
storage/mroonga/vendor/groonga/lib/dat/prefix-cursor.hpp vendored
View file

@ -38,17 +38,17 @@ class GRN_DAT_API PrefixCursor : public Cursor {
UInt32 limit = MAX_UINT32,
UInt32 flags = 0);
void close();
void close() override;
const Key &next();
const Key &next() override;
UInt32 offset() const {
UInt32 offset() const override {
return offset_;
}
UInt32 limit() const {
UInt32 limit() const override {
return limit_;
}
UInt32 flags() const {
UInt32 flags() const override {
return flags_;
}