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
66e1777a
Commit
66e1777a
authored
22 years ago
by
paul@teton.kitebird.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
parents
82dc93b5
3bd8dba6
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
17 deletions
+16
-17
myisammrg/myrg_delete.c
myisammrg/myrg_delete.c
+2
-3
myisammrg/myrg_locking.c
myisammrg/myrg_locking.c
+1
-3
myisammrg/myrg_rnext.c
myisammrg/myrg_rnext.c
+3
-0
myisammrg/myrg_rprev.c
myisammrg/myrg_rprev.c
+2
-2
myisammrg/myrg_rrnd.c
myisammrg/myrg_rrnd.c
+1
-1
myisammrg/myrg_rsame.c
myisammrg/myrg_rsame.c
+4
-6
myisammrg/myrg_update.c
myisammrg/myrg_update.c
+2
-1
myisammrg/myrg_write.c
myisammrg/myrg_write.c
+1
-1
No files found.
myisammrg/myrg_delete.c
View file @
66e1777a
...
...
@@ -23,8 +23,7 @@ MYRG_INFO *info,
const
byte
*
record
)
{
if
(
!
info
->
current_table
)
{
return
(
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
);
}
return
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
;
return
mi_delete
(
info
->
current_table
->
table
,
record
);
}
This diff is collapsed.
Click to expand it.
myisammrg/myrg_locking.c
View file @
66e1777a
...
...
@@ -20,9 +20,7 @@
#include "myrg_def.h"
int
myrg_lock_database
(
MYRG_INFO
*
info
,
int
lock_type
)
int
myrg_lock_database
(
MYRG_INFO
*
info
,
int
lock_type
)
{
int
error
,
new_error
;
MYRG_TABLE
*
file
;
...
...
This diff is collapsed.
Click to expand it.
myisammrg/myrg_rnext.c
View file @
66e1777a
...
...
@@ -25,6 +25,9 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx)
int
err
;
MI_INFO
*
mi
;
if
(
!
info
->
current_table
)
return
HA_ERR_KEY_NOT_FOUND
;
/* at first, do rnext for the table found before */
if
((
err
=
mi_rnext
(
info
->
current_table
->
table
,
NULL
,
inx
)))
{
...
...
This diff is collapsed.
Click to expand it.
myisammrg/myrg_rprev.c
View file @
66e1777a
...
...
@@ -25,8 +25,8 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx)
int
err
;
MI_INFO
*
mi
;
if
(
!
info
||
!
info
->
current_table
)
return
HA_ERR_
UNSUPPORTE
D
;
if
(
!
info
->
current_table
)
return
HA_ERR_
KEY_NOT_FOUN
D
;
/* at first, do rprev for the table found before */
if
((
err
=
mi_rprev
(
info
->
current_table
->
table
,
NULL
,
inx
)))
...
...
This diff is collapsed.
Click to expand it.
myisammrg/myrg_rrnd.c
View file @
66e1777a
...
...
@@ -24,7 +24,7 @@
static
MYRG_TABLE
*
find_table
(
MYRG_TABLE
*
start
,
MYRG_TABLE
*
end
,
ulonglong
pos
);
/*
If filepos == HA_OFFSET_ERROR, read next
If filepos == HA_OFFSET_ERROR, read next
Returns same as mi_rrnd:
0 = Ok.
HA_ERR_RECORD_DELETED = Record is deleted.
...
...
This diff is collapsed.
Click to expand it.
myisammrg/myrg_rsame.c
View file @
66e1777a
...
...
@@ -19,12 +19,10 @@
int
myrg_rsame
(
MYRG_INFO
*
info
,
byte
*
record
,
int
inx
)
{
if
(
inx
)
/* not yet used, should be 0 */
{
return
(
my_errno
=
HA_ERR_WRONG_INDEX
);
}
return
my_errno
=
HA_ERR_WRONG_INDEX
;
if
(
!
info
->
current_table
)
{
return
(
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
);
}
return
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
;
return
mi_rsame
(
info
->
current_table
->
table
,
record
,
inx
);
}
This diff is collapsed.
Click to expand it.
myisammrg/myrg_update.c
View file @
66e1777a
...
...
@@ -21,6 +21,7 @@
int
myrg_update
(
register
MYRG_INFO
*
info
,
const
byte
*
oldrec
,
byte
*
newrec
)
{
if
(
!
info
->
current_table
)
return
(
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
);
return
my_errno
=
HA_ERR_NO_ACTIVE_RECORD
;
return
mi_update
(
info
->
current_table
->
table
,
oldrec
,
newrec
);
}
This diff is collapsed.
Click to expand it.
myisammrg/myrg_write.c
View file @
66e1777a
...
...
@@ -26,5 +26,5 @@ int myrg_write(register MYRG_INFO *info, byte *rec)
else
if
(
info
->
merge_insert_method
==
MERGE_INSERT_TO_LAST
)
return
mi_write
(
info
->
end_table
[
-
1
].
table
,
rec
);
else
/* unsupported insertion method */
return
(
my_errno
=
HA_ERR_WRONG_COMMAND
);
return
my_errno
=
HA_ERR_WRONG_COMMAND
;
}
This diff is collapsed.
Click to expand it.
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