1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-21856 - xid_t::formatID has to be constrained to 4 byte size

Browse Source 
Engine (InnoDB) and XA replication MDEV-742 requires the XID member
be of a constant minimum across supported platform ulong size which
is 4 bytes.
This commit is contained in:
Sergey Vojtovich 2020-03-09 18:31:18 +04:00
parent 276e042de3
commit 82e997ad3f
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/main/xa.result
View File

@ -369,3 +369,8 @@ XA PREPARE 'Я_упaлa_c_сеновала_тормозила_головой';
XA ROLLBACK 'Я_упaлa_c_сеновала_тормозила_головой';
SET NAMES default;
DROP TABLE t1;
#
# MDEV-21856 - xid_t::formatID has to be constrained to 4 byte size
#
XA START 'gtrid', 'bqual', 0x80000000;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '0x80000000' at line 1

7
mysql-test/main/xa.test
View File

@ -506,4 +506,11 @@ SET NAMES default;
DROP TABLE t1;
--echo #
--echo # MDEV-21856 - xid_t::formatID has to be constrained to 4 byte size
--echo #
--error ER_PARSE_ERROR
XA START 'gtrid', 'bqual', 0x80000000;
--source include/wait_until_count_sessions.inc

4
sql/sql_yacc.yy
View File

@ -17553,7 +17553,9 @@ xid:
}
| text_string ',' text_string ',' ulong_num
{
MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE);
MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE &&
$3->length() <= MAXBQUALSIZE &&
$5 <= INT32_MAX);
if (unlikely(!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))))
MYSQL_YYABORT;
Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length());