database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-02 22:14:21 +02:00
parent 2ab52cc0e5 3a2116241b
commit 900d7bf360
245 changed files with 9723 additions and 2458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sql/sql_string.h
View File

@ -399,6 +399,7 @@ public:
}
void qs_append(const char *str, size_t len);
void qs_append_hex(const char *str, uint32 len);
void qs_append_hex_uint32(uint32 num);
void qs_append(double d);
void qs_append(const double *d);
inline void qs_append(const char c)
@ -614,7 +615,13 @@ public:
}
return false;
}
bool append_hex_uint32(uint32 num)
{
if (reserve(8))
return true;
qs_append_hex_uint32(num);
return false;
}
bool append_with_step(const char *s, uint32 arg_length, uint32 step_alloc)
{
uint32 new_length= arg_length + str_length;
@ -987,6 +994,17 @@ public:
{
return append(&ls);
}
bool append_name_value(const LEX_CSTRING &name,
const LEX_CSTRING &value,
uchar quot= '\0')
{
return
append(name) ||
append('=') ||
(quot && append(quot)) ||
append(value) ||
(quot && append(quot));
}
bool append(const char *s, size_t size);
bool append_with_prefill(const char *s, uint32 arg_length,
uint32 full_length, char fill_char);
@ -999,6 +1017,37 @@ public:
return append(s.str, s.length, cs);
}
/*
Append a bitmask in an uint32 with a translation into a
C-style human readable representation, e.g.:
0x05 -> "(flag04|flag01)"
@param flags - the flags to translate
@param names - an array of flag names
@param count - the number of available elements in "names"
*/
bool append_flag32_names(uint32 flags, LEX_CSTRING names[], size_t count)
{
bool added= false;
if (flags && append('('))
return true;
for (ulong i= 0; i <= 31; i++)
{
ulong bit= 31 - i;
if (flags & (1 << bit))
{
if (added && append('|'))
return true;
if (bit < count ? append(names[bit]) : append('?'))
return true;
added= true;
}
}
if (flags && append(')'))
return true;
return false;
}
void strip_sp();
friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
friend class Field;