mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
10.0-monty merge
includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
This commit is contained in:
commit
b7b5f6f1ab
1378 changed files with 124559 additions and 47549 deletions
|
|
@ -875,7 +875,7 @@ TrID trnman_get_min_safe_trid()
|
|||
{
|
||||
TrID trid;
|
||||
mysql_mutex_lock(&LOCK_trn_list);
|
||||
trid= min(active_list_min.next->min_read_from,
|
||||
trid= MY_MIN(active_list_min.next->min_read_from,
|
||||
global_trid_generator);
|
||||
mysql_mutex_unlock(&LOCK_trn_list);
|
||||
return trid;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue