database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-25 22:05:56 +03:00
parent b773270c39 86c3ba65aa
commit 4a32e2395e
140 changed files with 858 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sql/sql_string.h
View File

@@ -469,9 +469,21 @@ public:
}
bool append(const String &s);
bool append(const char *s);
bool append(const LEX_STRING *ls) { return append(ls->str, ls->length); }
bool append(const LEX_CSTRING *ls) { return append(ls->str, ls->length); }
bool append(const LEX_CSTRING &ls) { return append(ls.str, ls.length); }
bool append(const LEX_STRING *ls)
{
DBUG_ASSERT(ls->length < UINT_MAX32);
return append(ls->str, (uint32) ls->length);
}
bool append(const LEX_CSTRING *ls)
{
DBUG_ASSERT(ls->length < UINT_MAX32);
return append(ls->str, (uint32) ls->length);
}
bool append(const LEX_CSTRING &ls)
{
DBUG_ASSERT(ls.length < UINT_MAX32);
return append(ls.str, (uint32) ls.length);
}
bool append(const char *s, uint32 arg_length);
bool append(const char *s, uint32 arg_length, CHARSET_INFO *cs);
bool append_ulonglong(ulonglong val);
@@ -563,7 +575,8 @@ public:
}
void q_append(const LEX_CSTRING *ls)
{
q_append(ls->str, ls->length);
DBUG_ASSERT(ls->length < UINT_MAX32);
q_append(ls->str, (uint32) ls->length);
}
void write_at_position(int position, uint32 value)
@@ -647,7 +660,9 @@ public:
}
bool append_for_single_quote(const char *st)
{
return append_for_single_quote(st, strlen(st));
size_t len= strlen(st);
DBUG_ASSERT(len < UINT_MAX32);
return append_for_single_quote(st, (uint32) len);
}
/* Swap two string objects. Efficient way to exchange data without memcpy. */
@@ -691,10 +706,11 @@ public:
}
void q_net_store_data(const uchar *from, size_t length)
{
DBUG_ASSERT(length < UINT_MAX32);
DBUG_ASSERT(Alloced_length >= (str_length + length +
net_length_size(length)));
q_net_store_length(length);
q_append((const char *)from, length);
q_append((const char *)from, (uint32) length);
}
};