Merge lp:~hrvojem/percona-server/bug1229583-5.6 into lp:percona-server/5.6

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

- "but it is skipped for all log files writes" change is lost from the 5.5 MP.
- For innodb_flush_method, at "This is an existing |MySQL| 5.6 system variable.", please clarify what is the Percona addition, for example, " system variable, that has a new allowed value ALL_O_DIRECT" or similar.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/diagnostics/user_stats.rst'
--- doc/source/diagnostics/user_stats.rst	2013-07-12 08:38:41 +0000
+++ doc/source/diagnostics/user_stats.rst	2013-10-01 06:08:42 +0000
@@ -127,6 +127,9 @@
   | mysql        | tables_priv           | PRIMARY            |         2 |
   +--------------+-----------------------+--------------------+-----------+
 
+.. note:: 
+
+   Current implementation of index statistics doesn't support partitioned tables.
 
 
 .. table:: INFORMATION_SCHEMA.TABLE_STATISTICS
@@ -149,6 +152,9 @@
   | mysql        | tables_priv                   |         2 |            0 |                      0 | 
   +--------------+-------------------------------+-----------+--------------+------------------------+
 
+.. note:: 
+
+   Current implementation of table statistics doesn't support partitioned tables.
 
 .. table:: INFORMATION_SCHEMA.THREAD_STATISTICS
 
 
=== modified file 'doc/source/faq.rst'
--- doc/source/faq.rst	2013-05-27 13:46:13 +0000
+++ doc/source/faq.rst	2013-10-01 06:08:42 +0000
@@ -18,3 +18,8 @@
 ===================================================
 
 A: No, you don't need to change anything on the clients. |Percona Server| is 100% compatible with all existing client libraries and connectors.
+
+Q: When using the |Percona XtraBackup| to setup a replication slave on Debian based systems I'm getting: "ERROR 1045 (28000): Access denied for user 'debian-sys-maint'@'localhost' (using password: YES)" 
+==========================================================================================================================================================================================================
+
+A: In case you're using init script on Debian based system to start ``mysqld``, be sure that the password for ``debian-sys-maint`` user has been updated and it's the same as that user's password from the server that the backup has been taken from. Password can be seen and updated in :file:`/etc/mysql/debian.cnf`. For more information on how to set up a replication slave using |Percona XtraBackup| see `this how-to <http://www.percona.com/doc/percona-xtrabackup/2.1/howtos/setting_up_replication.html>`_.
 
=== modified file 'doc/source/scalability/innodb_io.rst'
--- doc/source/scalability/innodb_io.rst	2013-07-12 08:38:41 +0000
+++ doc/source/scalability/innodb_io.rst	2013-10-01 06:08:42 +0000
@@ -47,6 +47,36 @@
 
 This variable changes the size of transaction log records. The default size of 512 bytes is good in most situations. However, setting it to 4096 may be a good optimization with SSD cards. While settings other than 512 and 4096 are possible, as a practical matter these are really the only two that it makes sense to use. Clean restart and removal of the old logs is needed for the variable :variable:`innodb_log_block_size` to be changed.
 
+.. variable:: innodb_flush_method
+
+   :Version Info: - :rn:`5.6.13-61.0` - Ported from |Percona Server| 5.5
+   :cli: Yes
+   :conf: Yes
+   :scope: Global
+   :Dyn: No
+   :vartype: Enumeration
+   :default: ``fdatasync``
+   :allowed: ``fdatasync``, ``O_DSYNC``, ``O_DIRECT``, ``O_DIRECT_NO_FSYNC``, ``ALL_O_DIRECT``
+
+This is an existing |MySQL| 5.6 system variable that has a new allowed value ``ALL_O_DIRECT``. It determines the method |InnoDB| uses to flush its data and log files. (See ``innodb_flush_method`` in the |MySQL| 5.6 `Reference Manual <https://dev.mysql.com/doc/refman/5.6/en/innodb-parameters.html#sysvar_innodb_flush_method>`_).
+
+The following values are allowed:
+
+  * ``fdatasync``: 
+    use ``fsync()`` to flush both the data and log files.
+
+  * ``O_SYNC``: 
+    use O_SYNC to open and flush the log files; use ``fsync()`` to flush the data files.
+
+  * ``O_DIRECT``: 
+    use O_DIRECT to open the data files and fsync() system call to flush both the data and log files.
+
+  * ``O_DIRECT_NO_FSYNC``:
+    use O_DIRECT to open the data files but don't use ``fsync()`` system call to flush both the data and log files. This option isn't suitable for *XFS* file system.
+
+  * ``ALL_O_DIRECT``: 
+    use O_DIRECT to open both data and log files, and use ``fsync()`` to flush the data files but not the log files. This option is recommended when |InnoDB| log files are big (more than 8GB), otherwise there might be even a performance degradation. **Note**: When using this option on *ext4* filesystem variable :variable:`innodb_log_block_size` should be set to 4096 (default log-block-size in *ext4*) in order to avoid the ``unaligned AIO/DIO`` warnings.
+
 Status Variables
 ----------------
 
 
=== modified file 'doc/source/upstream-bug-fixes.rst'
--- doc/source/upstream-bug-fixes.rst	2013-09-27 11:57:54 +0000
+++ doc/source/upstream-bug-fixes.rst	2013-10-01 06:08:42 +0000
@@ -71,6 +71,12 @@
 |:Fix Released: :rn:`5.6.12-60.4`                                                                             |
 |:Upstream fix: N/A                                                                                           |
 +-------------------------------------------------------------------------------------------------------------+
+|:Upstream bug: :mysqlbug:`70277` - last argument of LOAD DATA ... SET ... statement repeated twice in binlog |
+|:Launchpad bug: :bug:`1223196`                                                                               |
+|:Upstream state: Verified (checked on 2013-09-30)                                                            |
+|:Fix Released: :rn:`5.6.11-60.3`                                                                             |
+|:Upstream fix: N/A                                                                                           |
++-------------------------------------------------------------------------------------------------------------+
 |:Upstream bug: :mysqlbug:`69252` - All the parts.partition_max* tests are broken with MTR --parallel         |
 |:Launchpad bug: :bug:`1180481`                                                                               |
 |:Upstream state: Verified (checked on 2013-09-27)                                                            |