Merge lp:~hrvojem/percona-server/adaptive_hash into lp:percona-server/5.5

Proposed by Hrvoje Matijakovic on 2012-02-03
Status: Merged
Approved by: Alexey Kopytov on 2012-02-03
Approved revision: 211
Merged at revision: 211
Proposed branch: lp:~hrvojem/percona-server/adaptive_hash
Merge into: lp:percona-server/5.5
Diff against target: 66 lines (+6/-6)
4 files modified
doc/source/conf.py (+1/-1)
doc/source/index.rst (+1/-1)
doc/source/release-notes/Percona-Server-5.5.8-20.0.rst (+1/-1)
doc/source/scalability/innodb_adaptive_hash_index_partitions.rst (+3/-3)
To merge this branch: bzr merge lp:~hrvojem/percona-server/adaptive_hash
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-02-03 Approve on 2012-02-03
Review via email: mp+91396@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Hroje,

A better way to do file renames with Bazaar is "bzr mv" instead of bzr rm/add. This way the changes are easier to review (you only see file content changes + rename), and you preserve the file history, because bzr knows what you actually want to do.

review: Needs Fixing
Alexey Kopytov (akopytov) wrote :

OK to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/conf.py'
2--- doc/source/conf.py 2012-01-27 08:36:38 +0000
3+++ doc/source/conf.py 2012-02-03 10:28:20 +0000
4@@ -45,7 +45,7 @@
5
6 # General information about the project.
7 project = u'Percona Server'
8-copyright = u'2011, Percona Inc'
9+copyright = u'2012, Percona Inc'
10
11 # The version info for the project you're documenting, acts as replacement for
12 # |version| and |release|, also used in various other places throughout the
13
14=== modified file 'doc/source/index.rst'
15--- doc/source/index.rst 2012-01-30 16:36:39 +0000
16+++ doc/source/index.rst 2012-02-03 10:28:20 +0000
17@@ -60,7 +60,7 @@
18 scalability/innodb_split_buf_pool_mutex
19 scalability/innodb_io_55
20 scalability/innodb_expand_undo_slots
21- scalability/innodb_adaptive_hash_partitions
22+ scalability/innodb_adaptive_hash_index_partitions
23
24 Performance Improvements
25 ========================
26
27=== modified file 'doc/source/release-notes/Percona-Server-5.5.8-20.0.rst'
28--- doc/source/release-notes/Percona-Server-5.5.8-20.0.rst 2011-10-07 23:38:41 +0000
29+++ doc/source/release-notes/Percona-Server-5.5.8-20.0.rst 2012-02-03 10:28:20 +0000
30@@ -11,7 +11,7 @@
31 New Features
32 ============
33
34- * |InnoDB| adaptive hash function searches can now be spread across multiple partitions (see :ref:`innodb_adaptive_hash_partitions_page`). Bug fixed: :bug:`688866`. (*Yasufumi Kinoshita*)
35+ * |InnoDB| adaptive hash function searches can now be spread across multiple partitions (see :ref:`innodb_adaptive_hash_index_partitions_page`). Bug fixed: :bug:`688866`. (*Yasufumi Kinoshita*)
36
37 * Information from ``SHOW INNODB STATUS`` was made available in new status variables in |InnoDB| Show Status. Bug fixed: :bug:`698797`.
38
39
40=== renamed file 'doc/source/scalability/innodb_adaptive_hash_partitions.rst' => 'doc/source/scalability/innodb_adaptive_hash_index_partitions.rst'
41--- doc/source/scalability/innodb_adaptive_hash_partitions.rst 2011-10-07 23:38:41 +0000
42+++ doc/source/scalability/innodb_adaptive_hash_index_partitions.rst 2012-02-03 10:28:20 +0000
43@@ -1,4 +1,4 @@
44-.. _innodb_adaptive_hash_partitions_page:
45+.. _innodb_adaptive_hash_index_partitions_page:
46
47 ==========================================
48 Multiple Adaptive Hash Search Partitions
49@@ -6,7 +6,7 @@
50
51 The |InnoDB| adaptive hash index can have contention issues on multi-core systems when you run a mix of read and write queries that need to scan secondary indexes. This feature splits the adaptive hash index across several partitions to avoid such problems.
52
53-The number of adaptive hash partitions specified by the variable ``innodb_adaptive_hash_partitions`` are created, and hash indexes are assigned to each one based on ``index_id``. This should help to solve contention problems in the adaptive hash search process when they occur.
54+The number of adaptive hash partitions specified by the variable ``innodb_adaptive_hash_index_partitions`` are created, and hash indexes are assigned to each one based on ``index_id``. This should help to solve contention problems in the adaptive hash search process when they occur.
55
56
57 Version Specific Information
58@@ -17,7 +17,7 @@
59 System Variables
60 ----------------
61
62-.. variable:: innodb_adaptive_hash_partitions
63+.. variable:: innodb_adaptive_hash_index_partitions
64
65 :version 5.5.8-20.0: Introduced
66 :cli: Yes

Subscribers

People subscribed via source and target branches