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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-06-15 15:27:11 +04:00
parent 3b1921c714 e813fe8622
commit 765347384a
629 changed files with 14636 additions and 11051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.cc
View File

@ -5601,6 +5601,7 @@ bool xid_cache_insert(THD *thd, XID_STATE *xid_state)
break;
case 1:
my_error(ER_XAER_DUPID, MYF(0));
/* fall through */
default:
xid_state->xid_cache_element= 0;
}