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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-03 16:24:47 +02:00
parent 44836bcd12 533a13af06
commit 133b4b46fe
44 changed files with 1706 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.h
View File

@ -866,8 +866,10 @@ struct xid_t {
void set(long f, const char *g, long gl, const char *b, long bl)
{
formatID= f;
memcpy(data, g, gtrid_length= gl);
memcpy(data+gl, b, bqual_length= bl);
if ((gtrid_length= gl))
memcpy(data, g, gl);
if ((bqual_length= bl))
memcpy(data+gl, b, bl);
}
void set(ulonglong xid)
{