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

[Hrvoje Matijakovic]

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-06-14 14:15:09 +0000
+++ doc/source/index.rst	2012-06-21 12:02:23 +0000
@@ -123,6 +123,7 @@
    management/innodb_fake_changes
    management/innodb_kill_idle_trx
    management/enforce_engine
+   management/secure_file_priv_extended
 
 Diagnostics Improvements
 ========================

=== added file 'doc/source/management/secure_file_priv_extended.rst'
--- doc/source/management/secure_file_priv_extended.rst	1970-01-01 00:00:00 +0000
+++ doc/source/management/secure_file_priv_extended.rst	2012-06-21 12:02:23 +0000
@@ -0,0 +1,27 @@
+.. _secure_file_priv_extended:
+
+=======================================================
+Extending the :option:`secure-file-priv` server option
+=======================================================
+
+|Percona Server| has extended :option:`secure-file-priv` server option. When used with no argument, the LOAD_FILE() function will always return NULL. The LOAD DATA INFILE and SELECT INTO OUTFILE statements will fail with the following error: "The MySQL server is running with the --secure-file-priv option so it cannot execute this statement". LOAD DATA LOCAL INFILE is not affected by the --secure-file-priv option and will still work when it's used without an argument.
+
+
+Version Specific Information
+============================
+
+  * :rn:`5.5.25-27.0`
+    Variable :variable:`secure-file-priv` extended behavior implemented.
+
+System Variables
+================
+
+.. variable:: secure-file-priv 
+
+     :cli: No
+     :conf: Yes
+     :scope: Global
+     :dyn: No
+     :vartype: String
+     :default: NULL
+