database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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

5
sql/sql_type.h
View File

@ -227,7 +227,7 @@ static inline uint32
char_to_byte_length_safe(size_t char_length_arg, uint32 mbmaxlen_arg)
{
ulonglong tmp= ((ulonglong) char_length_arg) * mbmaxlen_arg;
return tmp > UINT_MAX32 ? UINT_MAX32 : static_cast<uint32>(tmp);
return tmp > UINT_MAX32 ? (uint32) UINT_MAX32 : static_cast<uint32>(tmp);
}
/**
@ -531,11 +531,12 @@ class Name: private LEX_CSTRING
public:
Name(const char *str_arg, uint length_arg)
{
DBUG_ASSERT(length_arg < UINT_MAX32);
LEX_CSTRING::str= str_arg;
LEX_CSTRING::length= length_arg;
}
const char *ptr() const { return LEX_CSTRING::str; }
uint length() const { return LEX_CSTRING::length; }
uint length() const { return (uint) LEX_CSTRING::length; }
};