diff options
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 4 | ||||
| -rw-r--r-- | storage/xtradb/sync/sync0sync.cc | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 01c9e4ecdb7..bed8914f6e6 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -17462,8 +17462,8 @@ static MYSQL_SYSVAR_ULONGLONG(stats_modified_counter, srv_stats_modified_counter static MYSQL_SYSVAR_BOOL(stats_traditional, srv_stats_sample_traditional, PLUGIN_VAR_RQCMDARG, - "Enable traditional statistic calculation based on number of configured pages (default false)", - NULL, NULL, FALSE); + "Enable traditional statistic calculation based on number of configured pages (default true)", + NULL, NULL, TRUE); static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled, PLUGIN_VAR_OPCMDARG, diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index a3ec19b223b..11a217f865c 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -462,8 +462,8 @@ UNIV_INTERN my_bool srv_stats_auto_recalc = TRUE; UNIV_INTERN unsigned long long srv_stats_modified_counter = 0; /* Enable traditional statistic calculation based on number of configured -pages default false. */ -UNIV_INTERN my_bool srv_stats_sample_traditional = FALSE; +pages default true. */ +UNIV_INTERN my_bool srv_stats_sample_traditional = TRUE; UNIV_INTERN ibool srv_use_doublewrite_buf = TRUE; UNIV_INTERN ibool srv_use_atomic_writes = FALSE; diff --git a/storage/xtradb/sync/sync0sync.cc b/storage/xtradb/sync/sync0sync.cc index ca630531086..d02a0df70ca 100644 --- a/storage/xtradb/sync/sync0sync.cc +++ b/storage/xtradb/sync/sync0sync.cc @@ -649,6 +649,11 @@ spin_loop: mutex_set_waiters(mutex, 1); } + /* Make sure waiters store won't pass over mutex_test_and_set */ +#ifdef __powerpc__ + os_mb; +#endif + /* Try to reserve still a few times */ for (i = 0; i < 4; i++) { if (ib_mutex_test_and_set(mutex) == 0) { |