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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

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)]

OK to merge.

review: Approve

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2012-01-27 08:36:38 +0000
+++ doc/source/conf.py	2012-02-03 10:28:20 +0000
@@ -45,7 +45,7 @@
 
 # General information about the project.
 project = u'Percona Server'
-copyright = u'2011, Percona Inc'
+copyright = u'2012, Percona Inc'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 
=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-01-30 16:36:39 +0000
+++ doc/source/index.rst	2012-02-03 10:28:20 +0000
@@ -60,7 +60,7 @@
    scalability/innodb_split_buf_pool_mutex
    scalability/innodb_io_55
    scalability/innodb_expand_undo_slots
-   scalability/innodb_adaptive_hash_partitions
+   scalability/innodb_adaptive_hash_index_partitions
 
 Performance Improvements
 ========================
 
=== modified file 'doc/source/release-notes/Percona-Server-5.5.8-20.0.rst'
--- doc/source/release-notes/Percona-Server-5.5.8-20.0.rst	2011-10-07 23:38:41 +0000
+++ doc/source/release-notes/Percona-Server-5.5.8-20.0.rst	2012-02-03 10:28:20 +0000
@@ -11,7 +11,7 @@
 New Features
 ============
 
-  * |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*)
+  * |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*)
 
   * Information from ``SHOW INNODB STATUS`` was made available in new status variables in |InnoDB| Show Status. Bug fixed: :bug:`698797`.
 
 
=== renamed file 'doc/source/scalability/innodb_adaptive_hash_partitions.rst' => 'doc/source/scalability/innodb_adaptive_hash_index_partitions.rst'
--- doc/source/scalability/innodb_adaptive_hash_partitions.rst	2011-10-07 23:38:41 +0000
+++ doc/source/scalability/innodb_adaptive_hash_index_partitions.rst	2012-02-03 10:28:20 +0000
@@ -1,4 +1,4 @@
-.. _innodb_adaptive_hash_partitions_page:
+.. _innodb_adaptive_hash_index_partitions_page:
 
 ==========================================
  Multiple Adaptive Hash Search Partitions
@@ -6,7 +6,7 @@
 
 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.
 
-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.
+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.
 
 
 Version Specific Information
@@ -17,7 +17,7 @@
 System Variables
 ----------------
 
-.. variable:: innodb_adaptive_hash_partitions
+.. variable:: innodb_adaptive_hash_index_partitions
 
    :version 5.5.8-20.0: Introduced
    :cli: Yes