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

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-06-21 11:47:38 +0000
+++ doc/source/index.rst	2012-07-24 12:13:26 +0000
@@ -58,7 +58,6 @@
    scalability/innodb_split_buf_pool_mutex
    scalability/innodb_insert_buffer
    scalability/innodb_io_55
-   scalability/innodb_expand_undo_slots
    scalability/innodb_adaptive_hash_index_partitions
    scalability/innodb_extra_rseg
 

=== modified file 'doc/source/reliability/show_slave_status_nolock.rst'
--- doc/source/reliability/show_slave_status_nolock.rst	2012-02-13 08:49:21 +0000
+++ doc/source/reliability/show_slave_status_nolock.rst	2012-07-24 12:13:26 +0000
@@ -8,9 +8,9 @@
 
 If a ``STOP SLAVE`` command is given in this situation, it will wait and not complete execution until the long-executing thread has completed its task. If another thread now executes a ``SHOW SLAVE STATUS`` command while the STOP SLAVE command is waiting to complete, the ``SHOW SLAVE STATUS`` command will not be able to execute while the ``STOP SLAVE`` command is waiting.
 
-This features modifies the ``SLOW SLAVE STATUS`` syntax to allow: ::
+This features modifies the ``SHOW SLAVE STATUS`` syntax to allow: ::
 
-  SLOW SLAVE STATUS NOLOCK
+  SHOW SLAVE STATUS NOLOCK
 
 This will display the slave's status as if there were no lock, allowing the user to detect and understand the situation that is occurring.
 

=== modified file 'doc/source/scalability/innodb_adaptive_hash_index_partitions.rst'
--- doc/source/scalability/innodb_adaptive_hash_index_partitions.rst	2012-02-03 10:23:20 +0000
+++ doc/source/scalability/innodb_adaptive_hash_index_partitions.rst	2012-07-24 12:13:26 +0000
@@ -26,7 +26,7 @@
    :dyn: No
    :vartype: Numeric
    :def: 1
-   :range: 0-MAXINT
+   :range: 0-64, (on 32-bit platform 0-32)
 
 Specifies the number of partitions to use in the adaptive hash search process.
 

=== removed file 'doc/source/scalability/innodb_expand_undo_slots.rst'
--- doc/source/scalability/innodb_expand_undo_slots.rst	2012-06-20 11:11:13 +0000
+++ doc/source/scalability/innodb_expand_undo_slots.rst	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-.. _innodb_expand_undo_slots:
-
-======================================
-More Concurrent Transactions Available
-======================================
-
-|InnoDB| provides a fixed number of 1024 undo slots in its rollback segment, leaving room for 1024 transactions to run in parallel. If all the slots are used any new transaction will fail until a slot is freed, which can cause strange behaviors. This change provides a variable to expand the number of undo slots, up to 4072.
-
-This option is provided for servers that run out of undo slots. Use it if you find the following warning in the error log: ``Warning: cannot find a free slot for an undo log``.
-
-We discourage its use unless you get this warning, because it breaks compatibility with other programs. Specifically, it makes the datafiles unusable for ibbackup or for a |MySQL| server that is not run with this option.
-
-When you enable the option, the maximum number of undo slots is extended to 4072, instead of the default fixed value of 1024.
-
-You can then check whether the expanded slots (1025-4072) are used by starting :command:`mysqld` with ``innodb_extra_undoslots=OFF``:
-
-  * If the expanded slots are used: :command:`mysqld` refuses to start and prints an error in the error log: ::
-
-      InnoDB: Error: innodb_extra_undoslots option is disabled, but it was enabled before.
-      InnoDB: The datafile is not normal for mysqld and disabled innodb_extra_undoslots.
-      InnoDB: Enable innodb_extra_undoslots if it was enabled before, and
-      InnoDB: ### don't use this datafile with other mysqld or ibbackup! ###
-      InnoDB: Cannot continue operation for the safety. Calling exit(1).
-
-  * If the expanded slots are not used: :command:`mysqld` starts and prints only a warning in the error log: ::
-
-      InnoDB: Warning: innodb_extra_undoslots option is disabled, but it was enabled before.
-      InnoDB: But extended undo slots seem not used, so continue operation.
-
-
-System Variables
-----------------
-
-.. psdom:variable:: innodb_extra_undoslots
-
-   :cli: Yes
-   :Conf: Yes
-   :scope: Global
-   :dyn: No
-   :vartype: BOOL
-   :def: OFF
-   :range: ON/OFF
-
-If ``ON``, expands the number of undo slots to 4072.

=== modified file 'doc/source/upgrading_guide_51_55.rst'
--- doc/source/upgrading_guide_51_55.rst	2012-07-18 06:25:14 +0000
+++ doc/source/upgrading_guide_51_55.rst	2012-07-24 12:13:26 +0000
@@ -20,6 +20,10 @@
 
   * http://dev.mysql.com/doc/refman/5.5/en/upgrading-from-previous-series.html
 
+
+.. warning:: 
+ Upgrade 5.1 to 5.5 on a crashed instance is not recommended. If the server instance has crashed, crash recovery should be run before proceeding with the upgrade.
+
 Changes in Server Configuration
 ===============================
 
@@ -165,7 +169,7 @@
 Also, the variable innodb_file_io_threads has been replaced by innodb_read_io_threads and innodb_write_io_threads (these variables were already introduced in Percona Server 5.1). All of them defaults to 4, you should replace the old variable with the two new ones with the proper value (or delete it if the default - 4 - is acceptable).
 
 
-Changes in Server Behaviour and Functioning
+Changes in Server Behavior and Functioning
 ===========================================
 
 Privileges
@@ -291,6 +295,9 @@
 
 and proceed to do the modifications needed in your configuration file, as explained at the beginning of this guide.
 
+.. note:: 
+ For extra safety doing the slow InnoDB shutdown before the upgrade is recommended.
+
 Then install the new server with: ::
 
   $ sudo apt-get install percona-server-server-5.5