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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES also shows internal temporary tables created by ALTER TABLES (but not those created to process complex queries).

[Alexey Kopytov (akopytov)]

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/diagnostics/misc_info_schema_tables.rst'
--- doc/source/diagnostics/misc_info_schema_tables.rst	2011-10-07 23:38:41 +0000
+++ doc/source/diagnostics/misc_info_schema_tables.rst	2012-03-12 08:07:19 +0000
@@ -4,7 +4,7 @@
  Misc. INFORMATION_SCHEMA Tables
 =================================
 
-This page lists the ``INFORMATION_SCHEMA`` tables added to standard |MySQL| by |Percona Server| that don``t exist elsewhere in the documentation.
+This page lists the ``INFORMATION_SCHEMA`` tables added to standard |MySQL| by |Percona Server| that don't exist elsewhere in the documentation.
 
 Compressed pages in |InnoDB| tables
 ===================================
@@ -93,13 +93,15 @@
    :column TRX_MYSQL_THREAD_ID: Thread id
    :column TRX_QUERY: SQL query being executed
 
-This table holds information on every transaction running in the |InnoDB| kernel. Contrary to the output of SHOW |InnoDB| STATUS, it doesn``t show information on idle transactions.
+This table holds information on every transaction running in the |InnoDB| kernel. Contrary to the output of SHOW |InnoDB| STATUS, it doesn't show information on idle transactions.
 
 This table was introduced by the |InnoDB| plugin and you can find the full documentation here.
 
 Temporary tables
 ================
 
+ Only the temporary tables that were explicitly created with `CREATE TEMPORARY TABLE` or `ALTER TABLE` are shown, and not the ones created to process complex queries.
+
 .. table:: INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES
 
    :column SESSION_ID: |MySQL| connection id
 
=== modified file 'doc/source/scalability/innodb_io_55.rst'
--- doc/source/scalability/innodb_io_55.rst	2012-02-24 09:51:35 +0000
+++ doc/source/scalability/innodb_io_55.rst	2012-03-12 08:07:19 +0000
@@ -219,6 +219,22 @@
 
 If ``innodb_use_global_flush_log_at_trx_commit=1`` (True), the user session will use the current value of ``innodb_flush_log_at_trx_commit``, and the user cannot reset the value of the global variable using a ``SET`` command.
 
+.. variable:: innodb_log_file_size
+
+   :version 5.5.8-20.0: Introduced
+   :cli: Yes
+   :conf: Yes
+   :scope: Global
+   :dyn: No
+   :type: Numeric
+   :default: 5242880
+   :range: 1048576 .. 4294967295
+
+In upstream |MySQL| the limit for the combined size of log files must be less than 4GB. But in Percona Server it is:
+  * on 32-bit systems: individual log file limit is 4 GB and total log file size limit is 4 GB, i.e. the same as in the upstream server.
+  * on 64-bit systems: both individual log files and total log file size are practically unlimited (the limit is 2^63 - 1 bytes which is 8+ million TB).
+
+
 Status Variables
 ----------------