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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7e0c8d90
Commit
7e0c8d90
authored
Oct 24, 2000
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for new berkeley DB interface
Docs/manual.texi: Update for 3.23.27
parent
50c35d5d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
Docs/manual.texi
Docs/manual.texi
+2
-0
sql/ha_berkeley.cc
sql/ha_berkeley.cc
+4
-4
No files found.
Docs/manual.texi
View file @
7e0c8d90
...
@@ -38173,6 +38173,8 @@ though, so 3.23 is not released as a stable version yet.
...
@@ -38173,6 +38173,8 @@ though, so 3.23 is not released as a stable version yet.
Fixed bug where the automatic repair of MyISAM tables failed sometimes
Fixed bug where the automatic repair of MyISAM tables failed sometimes
when the data file was corrupt.
when the data file was corrupt.
@item
@item
Fixed a bug in @code{SHOW CREATE} when using auto_increment columns.
@item
Changed BDB tables to use new compare function in Berkeley DB 3.2.3
Changed BDB tables to use new compare function in Berkeley DB 3.2.3
@item
@item
You can now use Unix sockets with @code{mit-pthreads}
You can now use Unix sockets with @code{mit-pthreads}
sql/ha_berkeley.cc
View file @
7e0c8d90
...
@@ -213,7 +213,7 @@ berkeley_cmp_hidden_key(DB* file, const DBT *new_key, const DBT *saved_key)
...
@@ -213,7 +213,7 @@ berkeley_cmp_hidden_key(DB* file, const DBT *new_key, const DBT *saved_key)
static
int
static
int
berkeley_cmp_packed_key
(
DB
*
file
,
const
DBT
*
new_key
,
const
DBT
*
saved_key
)
berkeley_cmp_packed_key
(
DB
*
file
,
const
DBT
*
new_key
,
const
DBT
*
saved_key
)
{
{
KEY
*
key
=
(
KEY
*
)
BT_APP_PRIVATE
(
fil
e
);
KEY
*
key
=
(
KEY
*
)
(
file
->
app_privat
e
);
char
*
new_key_ptr
=
(
char
*
)
new_key
->
data
;
char
*
new_key_ptr
=
(
char
*
)
new_key
->
data
;
char
*
saved_key_ptr
=
(
char
*
)
saved_key
->
data
;
char
*
saved_key_ptr
=
(
char
*
)
saved_key
->
data
;
KEY_PART_INFO
*
key_part
=
key
->
key_part
,
*
end
=
key_part
+
key
->
key_parts
;
KEY_PART_INFO
*
key_part
=
key
->
key_part
,
*
end
=
key_part
+
key
->
key_parts
;
...
@@ -244,7 +244,7 @@ berkeley_cmp_packed_key(DB *file, const DBT *new_key, const DBT *saved_key)
...
@@ -244,7 +244,7 @@ berkeley_cmp_packed_key(DB *file, const DBT *new_key, const DBT *saved_key)
static
int
static
int
berkeley_cmp_fix_length_key
(
DB
*
file
,
const
DBT
*
new_key
,
const
DBT
*
saved_key
)
berkeley_cmp_fix_length_key
(
DB
*
file
,
const
DBT
*
new_key
,
const
DBT
*
saved_key
)
{
{
KEY
*
key
=
(
KEY
*
)
BT_APP_PRIVATE
(
fil
e
);
KEY
*
key
=
(
KEY
*
)
(
file
->
app_privat
e
);
char
*
new_key_ptr
=
(
char
*
)
new_key
->
data
;
char
*
new_key_ptr
=
(
char
*
)
new_key
->
data
;
char
*
saved_key_ptr
=
(
char
*
)
saved_key
->
data
;
char
*
saved_key_ptr
=
(
char
*
)
saved_key
->
data
;
KEY_PART_INFO
*
key_part
=
key
->
key_part
,
*
end
=
key_part
+
key
->
key_parts
;
KEY_PART_INFO
*
key_part
=
key
->
key_part
,
*
end
=
key_part
+
key
->
key_parts
;
...
@@ -322,7 +322,7 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked)
...
@@ -322,7 +322,7 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked)
(
hidden_primary_key
?
berkeley_cmp_hidden_key
:
(
hidden_primary_key
?
berkeley_cmp_hidden_key
:
berkeley_cmp_packed_key
));
berkeley_cmp_packed_key
));
if
(
!
hidden_primary_key
)
if
(
!
hidden_primary_key
)
file
->
set_bt_app_private
(
file
,
table
->
key_info
+
table
->
primary_key
);
file
->
app_private
=
(
void
*
)
(
table
->
key_info
+
table
->
primary_key
);
if
((
error
=
(
file
->
open
(
file
,
fn_format
(
name_buff
,
name
,
""
,
ha_berkeley_ext
,
if
((
error
=
(
file
->
open
(
file
,
fn_format
(
name_buff
,
name
,
""
,
ha_berkeley_ext
,
2
|
4
),
2
|
4
),
"main"
,
DB_BTREE
,
open_mode
,
0
))))
"main"
,
DB_BTREE
,
open_mode
,
0
))))
...
@@ -361,7 +361,7 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked)
...
@@ -361,7 +361,7 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked)
sprintf
(
part
,
"key%02d"
,
++
used_keys
);
sprintf
(
part
,
"key%02d"
,
++
used_keys
);
key_type
[
i
]
=
table
->
key_info
[
i
].
flags
&
HA_NOSAME
?
DB_NOOVERWRITE
:
0
;
key_type
[
i
]
=
table
->
key_info
[
i
].
flags
&
HA_NOSAME
?
DB_NOOVERWRITE
:
0
;
(
*
ptr
)
->
set_bt_compare
(
*
ptr
,
berkeley_cmp_packed_key
);
(
*
ptr
)
->
set_bt_compare
(
*
ptr
,
berkeley_cmp_packed_key
);
(
*
ptr
)
->
set_bt_app_private
(
*
ptr
,
table
->
key_info
+
i
);
(
*
ptr
)
->
app_private
=
(
void
*
)
(
table
->
key_info
+
i
);
if
(
!
(
table
->
key_info
[
i
].
flags
&
HA_NOSAME
))
if
(
!
(
table
->
key_info
[
i
].
flags
&
HA_NOSAME
))
(
*
ptr
)
->
set_flags
(
*
ptr
,
DB_DUP
);
(
*
ptr
)
->
set_flags
(
*
ptr
,
DB_DUP
);
if
((
error
=
((
*
ptr
)
->
open
(
*
ptr
,
name_buff
,
part
,
DB_BTREE
,
if
((
error
=
((
*
ptr
)
->
open
(
*
ptr
,
name_buff
,
part
,
DB_BTREE
,
...
...
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