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
4e0b80d9
Commit
4e0b80d9
authored
Oct 13, 2005
by
bar@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12476
parents
85243ffd
8682dffc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
11 deletions
+2
-11
include/m_string.h
include/m_string.h
+0
-9
myisam/mi_search.c
myisam/mi_search.c
+1
-1
strings/ctype-tis620.c
strings/ctype-tis620.c
+1
-1
No files found.
include/m_string.h
View file @
4e0b80d9
...
@@ -122,15 +122,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len);
...
@@ -122,15 +122,6 @@ extern void bmove_align(gptr dst,const gptr src,uint len);
#define bmove512(A,B,C) memcpy(A,B,C)
#define bmove512(A,B,C) memcpy(A,B,C)
#endif
#endif
#ifdef HAVE_purify
#define memcpy_overlap(A,B,C) \
DBUG_ASSERT((A) <= (B) || ((B)+(C)) <= (A)); \
bmove((byte*) (A),(byte*) (B),(size_t) (C));
#else
#define memcpy_overlap(A,B,C) memcpy((A), (B), (C))
#endif
/* HAVE_purify */
/* Prototypes for string functions */
/* Prototypes for string functions */
#if !defined(bfill) && !defined(HAVE_BFILL)
#if !defined(bfill) && !defined(HAVE_BFILL)
...
...
myisam/mi_search.c
View file @
4e0b80d9
...
@@ -978,7 +978,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
...
@@ -978,7 +978,7 @@ uint _mi_get_binary_pack_key(register MI_KEYDEF *keyinfo, uint nod_flag,
}
}
DBUG_PRINT
(
"info"
,(
"key: %lx from: %lx length: %u"
,
DBUG_PRINT
(
"info"
,(
"key: %lx from: %lx length: %u"
,
(
long
)
key
,
(
long
)
from
,
length
));
(
long
)
key
,
(
long
)
from
,
length
));
mem
cpy_overlap
((
byte
*
)
key
,
(
byte
*
)
from
,
(
size_t
)
length
);
mem
move
((
byte
*
)
key
,
(
byte
*
)
from
,
(
size_t
)
length
);
key
+=
length
;
key
+=
length
;
from
+=
length
;
from
+=
length
;
}
}
...
...
strings/ctype-tis620.c
View file @
4e0b80d9
...
@@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len)
...
@@ -498,7 +498,7 @@ static uint thai2sortable(uchar *tstr, uint len)
l2bias use to control position weight of l2char
l2bias use to control position weight of l2char
example (*=l2char) XX*X must come before X*XX
example (*=l2char) XX*X must come before X*XX
*/
*/
mem
cpy_overlap
((
char
*
)
p
,
(
char
*
)
(
p
+
1
),
tlen
-
1
);
mem
move
((
char
*
)
p
,
(
char
*
)
(
p
+
1
),
tlen
-
1
);
tstr
[
len
-
1
]
=
l2bias
+
t_ctype0
[
1
]
-
L2_GARAN
+
1
;
tstr
[
len
-
1
]
=
l2bias
+
t_ctype0
[
1
]
-
L2_GARAN
+
1
;
p
--
;
p
--
;
continue
;
continue
;
...
...
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