database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

cleanup: formatting

Browse Source 
also avoid an oxymoron of using `MYSQL_PLUGIN_IMPORT` under
`#ifdef MYSQL_SERVER`, and empty_clex_str is so trivial that a plugin
can define it if needed.
This commit is contained in:
Sergei Golubchik
2021-06-09 18:31:23 +02:00
parent 89342a3bd5
commit 3648b333c7
13 changed files with 65 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_string.h
View File

@ -42,10 +42,11 @@ typedef struct st_mem_root MEM_ROOT;
#define ASSERT_LENGTH(A) DBUG_ASSERT(str_length + (uint32) (A) <= Alloced_length)
#include "pack.h"
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
class Binary_string;
int sortcmp(const Binary_string *s, const Binary_string *t, CHARSET_INFO *cs);
int stringcmp(const Binary_string *s, const Binary_string *t);
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
inline uint32 copy_and_convert(char *to, size_t to_length,
CHARSET_INFO *to_cs,
inline uint32 copy_and_convert(char *to, size_t to_length, CHARSET_INFO *to_cs,
const char *from, size_t from_length,
CHARSET_INFO *from_cs, uint *errors)
{
@ -787,8 +788,7 @@ class String: public Charset, public Binary_string
{
public:
String() { }
String(size_t length_arg)
:Binary_string(length_arg)
String(size_t length_arg) :Binary_string(length_arg)
{ }
/*
NOTE: If one intend to use the c_ptr() method, the following two
@ -796,16 +796,13 @@ public:
room for zero termination).
*/
String(const char *str, size_t len, CHARSET_INFO *cs)
:Charset(cs),
Binary_string(str, len)
:Charset(cs), Binary_string(str, len)
{ }
String(char *str, size_t len, CHARSET_INFO *cs)
:Charset(cs),
Binary_string(str, len)
:Charset(cs), Binary_string(str, len)
{ }
String(const String &str)
:Charset(str),
Binary_string(str)
:Charset(str), Binary_string(str)
{ }
void set(String &str,size_t offset,size_t arg_length)
@ -994,8 +991,6 @@ public:
}
void strip_sp();
friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
friend int stringcmp(const String *a,const String *b);
friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
friend class Field;
uint32 numchars() const