mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Compile fix for NDB 5.1.2 on Solaris, provided by Pekka.
This commit is contained in:
parent
c51e75e67f
commit
f91475a7aa
3 changed files with 11 additions and 3 deletions
|
@ -250,6 +250,7 @@ class Dbtup: public SimulatedBlock {
|
|||
friend class Suma;
|
||||
public:
|
||||
struct KeyReqStruct;
|
||||
friend struct KeyReqStruct; // CC
|
||||
typedef bool (Dbtup::* ReadFunction)(Uint32*,
|
||||
KeyReqStruct*,
|
||||
AttributeHeader*,
|
||||
|
@ -2345,14 +2346,15 @@ private:
|
|||
//---------------------------------------------------------------
|
||||
//
|
||||
// Public methods
|
||||
Uint32* alloc_var_rec(Fragrecord*, Tablerec*, Uint32, Local_key*, Uint32*,
|
||||
Uint32 base);
|
||||
Uint32* alloc_var_rec(Fragrecord*const, Tablerec*const, Uint32, Local_key*,
|
||||
Uint32*, Uint32 base);
|
||||
void free_var_part(Fragrecord*, Tablerec*, Var_part_ref, Uint32 chain);
|
||||
void free_var_part(Fragrecord*, Tablerec*, Local_key*, Var_page*, Uint32 chain);
|
||||
|
||||
void validate_page(Tablerec*, Var_page* page);
|
||||
|
||||
Uint32* alloc_fix_rec(Fragrecord*, Tablerec*, Local_key*, Uint32 *);
|
||||
Uint32* alloc_fix_rec(Fragrecord*const, Tablerec*const, Local_key*,
|
||||
Uint32*);
|
||||
void free_fix_rec(Fragrecord*, Tablerec*, Local_key*, Fix_page*);
|
||||
|
||||
// Private methods
|
||||
|
|
|
@ -243,6 +243,9 @@ public:
|
|||
private:
|
||||
friend class Page_cache_client;
|
||||
|
||||
struct Page_entry; // CC
|
||||
friend struct Page_entry;
|
||||
|
||||
struct Page_request {
|
||||
enum Flags {
|
||||
OP_MASK = 0x000F // 4 bits for TUP operation
|
||||
|
|
|
@ -72,6 +72,9 @@ public:
|
|||
};
|
||||
private:
|
||||
|
||||
struct File; // CC
|
||||
friend struct File;
|
||||
|
||||
struct File
|
||||
{
|
||||
File() {}
|
||||
|
|
Loading…
Reference in a new issue