diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /storage/maria/trnman.c | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
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
Diffstat (limited to 'storage/maria/trnman.c')
| -rw-r--r-- | storage/maria/trnman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/trnman.c b/storage/maria/trnman.c index 4979b806c5e..d2d14092cac 100644 --- a/storage/maria/trnman.c +++ b/storage/maria/trnman.c @@ -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; |