mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Update Mroonga to the latest version on 2015-04-30T04:44:30+0900
This commit is contained in:
parent
060ec5b6b9
commit
a0fdb258a4
413 changed files with 25886 additions and 5251 deletions
|
|
@ -42,6 +42,12 @@
|
|||
# endif // WIN32
|
||||
#endif // GRN_DAT_API
|
||||
|
||||
#ifdef WIN32
|
||||
# define grn_memcpy(dest, src, n) ::memcpy_s((dest), (n), (src), (n))
|
||||
#else // WIN32
|
||||
# define grn_memcpy(dest, src, n) std::memcpy((dest), (src), (n))
|
||||
#endif // WIN32
|
||||
|
||||
namespace grn {
|
||||
namespace dat {
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ void KeyCursor::ascending_init(const String &min_str, const String &max_str) {
|
|||
if (max_str.ptr() != NULL) {
|
||||
if (max_str.length() != 0) {
|
||||
end_buf_ = new UInt8[max_str.length()];
|
||||
std::memcpy(end_buf_, max_str.ptr(), max_str.length());
|
||||
grn_memcpy(end_buf_, max_str.ptr(), max_str.length());
|
||||
end_str_.assign(end_buf_, max_str.length());
|
||||
}
|
||||
}
|
||||
|
|
@ -206,7 +206,7 @@ void KeyCursor::descending_init(const String &min_str, const String &max_str) {
|
|||
if (min_str.ptr() != NULL) {
|
||||
if (min_str.length() != 0) {
|
||||
end_buf_ = new UInt8[min_str.length()];
|
||||
std::memcpy(end_buf_, min_str.ptr(), min_str.length());
|
||||
grn_memcpy(end_buf_, min_str.ptr(), min_str.length());
|
||||
end_str_.assign(end_buf_, min_str.length());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue