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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-10 21:38:55 +03:00
parent 17be2b47ba eae968f62d
commit 1c58748196
64 changed files with 1622 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_string.h
View File

@ -524,6 +524,7 @@ public:
bool set_hex(ulonglong num);
bool set_hex(const char *str, uint32 len);
bool set_fcvt(double num, uint decimals);
bool copy(); // Alloc string if not alloced
bool copy(const Binary_string &s); // Allocate new string
@ -781,6 +782,11 @@ public:
bool set(longlong num, CHARSET_INFO *cs) { return set_int(num, false, cs); }
bool set(ulonglong num, CHARSET_INFO *cs) { return set_int((longlong)num, true, cs); }
bool set_real(double num,uint decimals, CHARSET_INFO *cs);
bool set_fcvt(double num, uint decimals)
{
set_charset(&my_charset_latin1);
return Binary_string::set_fcvt(num, decimals);
}
bool set_hex(ulonglong num)
{