diff options
| author | unknown <timour@askmonty.org> | 2012-11-01 21:36:31 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-01 21:36:31 +0200 |
| commit | a1108a0b6c098c7bae8b12d31b6338d563a318c1 (patch) | |
| tree | cb513a6dca8a0d7dfa14b4d13e930788139280a7 /storage/maria/ha_maria.cc | |
| parent | 9b6fe965033aab5eb20a4f2eefa482534b15c424 (diff) | |
| parent | 8b5d345eea3b4df053a1cdbff398d270af9547ad (diff) | |
| download | mariadb-git-a1108a0b6c098c7bae8b12d31b6338d563a318c1.tar.gz | |
Merge 5.2 -> 5.3
Diffstat (limited to 'storage/maria/ha_maria.cc')
| -rw-r--r-- | storage/maria/ha_maria.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 962ee211b72..3e76b297495 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2528,9 +2528,10 @@ int ha_maria::info(uint flag, my_bool lock_table_share) errkey= maria_info.errkey; my_store_ptr(dup_ref, ref_length, maria_info.dup_key_pos); } - /* Faster to always update, than to do it based on flag */ - stats.update_time= maria_info.update_time; - stats.auto_increment_value= maria_info.auto_increment; + if (flag & HA_STATUS_TIME) + stats.update_time= maria_info.update_time; + if (flag & HA_STATUS_AUTO) + stats.auto_increment_value= maria_info.auto_increment; return 0; } |