From 693fee5d561177e67223300015e5f16817c369e9 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Thu, 5 May 2011 12:10:49 +0300
Subject: [PATCH] Addendum 3 for bug #BUG#11764517 : expand secure_file_priv to
 the real patch so that it can later be compared with patchs with expanded
 symlinks

---
 mysql-test/mysql-test-run.pl |  4 ----
 mysql-test/r/loaddata.result |  6 ------
 mysql-test/t/loaddata.test   | 14 ++++++++++----
 sql/mysqld.cc                | 20 +++++++++++++++++---
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 203f964c72e..f43cadd3784 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -873,10 +873,6 @@ sub command_line_setup () {
 	last;
       }
     }
-
-    # point vardir to the mem location
-    $opt_vardir= $opt_mem;
-    undef $opt_mem;
   }
 
   # --------------------------------------------------------------------------
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 30f4dbfc6ef..39b4e35495f 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -193,12 +193,6 @@ select * from t1;
 a	b	c
 10	NULL	Ten
 15	NULL	Fifteen
-show variables like "secure_file_pri%";
-Variable_name	Value
-secure_file_priv	MYSQLTEST_VARDIR/
-select @@secure_file_priv;
-@@secure_file_priv
-MYSQLTEST_VARDIR/
 set @@secure_file_priv= 0;
 ERROR HY000: Variable 'secure_file_priv' is a read only variable
 truncate table t1;
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
index d86c395e436..4a538716133 100644
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
@@ -149,10 +149,16 @@ select * from t1;
 #
 # It should not be possible to load from a file outside of vardir
 
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-show variables like "secure_file_pri%";
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-select @@secure_file_priv;
+# The following lines were disabled because of patch for
+# bug 50373. MYSQLTEST_VARDIR doesn't rewrite symlinks
+# to real paths, but this is done for secure_file_priv.
+# Because of this the result can't be replaced if the
+# test suite runs with the --mem option which creates
+# symlinks to the ramdisk.
+#--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+#show variables like "secure_file_pri%";
+#--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+#select @@secure_file_priv;
 --error 1238
 set @@secure_file_priv= 0;
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3291085f380..caeac5be100 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7974,9 +7974,23 @@ static void fix_paths(void)
    */
   if (opt_secure_file_priv)
   {
-    convert_dirname(buff, opt_secure_file_priv, NullS);
-    my_free(opt_secure_file_priv, MYF(0));
-    opt_secure_file_priv= my_strdup(buff, MYF(MY_FAE));
+    if (*opt_secure_file_priv == 0)
+    {    
+      opt_secure_file_priv= 0;
+    }      
+    else 
+    {    
+      if (strlen(opt_secure_file_priv) >= FN_REFLEN)
+        opt_secure_file_priv[FN_REFLEN-1]= '\0';
+      if (my_realpath(buff, opt_secure_file_priv, 0))
+      {    
+        sql_print_warning("Failed to normalize the argument for --secure-file-priv.");
+        exit(1);
+      }      
+      char *secure_file_real_path= (char *)my_malloc(FN_REFLEN, MYF(MY_FAE));
+      convert_dirname(secure_file_real_path, buff, NullS);      my_free(opt_secure_file_priv, MYF(0));
+      opt_secure_file_priv= secure_file_real_path;
+    }
   }
 }