Commit 3709b2b3 authored by unknown's avatar unknown

Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1

parents 112922b5 9382f3a0
...@@ -390,6 +390,9 @@ extern ulong srv_commit_concurrency; ...@@ -390,6 +390,9 @@ extern ulong srv_commit_concurrency;
} }
#endif #endif
#ifdef WITH_BERKELEY_STORAGE_ENGINE #ifdef WITH_BERKELEY_STORAGE_ENGINE
#ifndef HAVE_U_INT32_T
typedef unsigned int u_int32_t;
#endif
extern const u_int32_t bdb_DB_TXN_NOSYNC, bdb_DB_RECOVER, bdb_DB_PRIVATE; extern const u_int32_t bdb_DB_TXN_NOSYNC, bdb_DB_RECOVER, bdb_DB_PRIVATE;
extern bool berkeley_shared_data; extern bool berkeley_shared_data;
extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type, extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type,
......
...@@ -250,6 +250,7 @@ class Dbtup: public SimulatedBlock { ...@@ -250,6 +250,7 @@ class Dbtup: public SimulatedBlock {
friend class Suma; friend class Suma;
public: public:
struct KeyReqStruct; struct KeyReqStruct;
friend struct KeyReqStruct; // CC
typedef bool (Dbtup::* ReadFunction)(Uint32*, typedef bool (Dbtup::* ReadFunction)(Uint32*,
KeyReqStruct*, KeyReqStruct*,
AttributeHeader*, AttributeHeader*,
...@@ -2345,14 +2346,15 @@ private: ...@@ -2345,14 +2346,15 @@ private:
//--------------------------------------------------------------- //---------------------------------------------------------------
// //
// Public methods // Public methods
Uint32* alloc_var_rec(Fragrecord*, Tablerec*, Uint32, Local_key*, Uint32*, Uint32* alloc_var_rec(Fragrecord*const, Tablerec*const, Uint32, Local_key*,
Uint32 base); Uint32*, Uint32 base);
void free_var_part(Fragrecord*, Tablerec*, Var_part_ref, Uint32 chain); void free_var_part(Fragrecord*, Tablerec*, Var_part_ref, Uint32 chain);
void free_var_part(Fragrecord*, Tablerec*, Local_key*, Var_page*, Uint32 chain); void free_var_part(Fragrecord*, Tablerec*, Local_key*, Var_page*, Uint32 chain);
void validate_page(Tablerec*, Var_page* page); 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*); void free_fix_rec(Fragrecord*, Tablerec*, Local_key*, Fix_page*);
// Private methods // Private methods
......
...@@ -243,6 +243,9 @@ public: ...@@ -243,6 +243,9 @@ public:
private: private:
friend class Page_cache_client; friend class Page_cache_client;
struct Page_entry; // CC
friend struct Page_entry;
struct Page_request { struct Page_request {
enum Flags { enum Flags {
OP_MASK = 0x000F // 4 bits for TUP operation OP_MASK = 0x000F // 4 bits for TUP operation
......
...@@ -72,6 +72,9 @@ public: ...@@ -72,6 +72,9 @@ public:
}; };
private: private:
struct File; // CC
friend struct File;
struct File struct File
{ {
File() {} File() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment