Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3709b2b3
Commit
3709b2b3
authored
Nov 10, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/clone-5.1
parents
112922b5
9382f3a0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
3 deletions
+14
-3
sql/mysqld.cc
sql/mysqld.cc
+3
-0
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+5
-3
storage/ndb/src/kernel/blocks/pgman.hpp
storage/ndb/src/kernel/blocks/pgman.hpp
+3
-0
storage/ndb/src/kernel/blocks/restore.hpp
storage/ndb/src/kernel/blocks/restore.hpp
+3
-0
No files found.
sql/mysqld.cc
View file @
3709b2b3
...
@@ -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
,
...
...
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file @
3709b2b3
...
@@ -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
...
...
storage/ndb/src/kernel/blocks/pgman.hpp
View file @
3709b2b3
...
@@ -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
...
...
storage/ndb/src/kernel/blocks/restore.hpp
View file @
3709b2b3
...
@@ -72,6 +72,9 @@ public:
...
@@ -72,6 +72,9 @@ public:
};
};
private:
private:
struct
File
;
// CC
friend
struct
File
;
struct
File
struct
File
{
{
File
()
{}
File
()
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment