Respect the --secure-file-priv server options when dealing

with tables having FILE_NAME.

modified:
  mysql-test/suite/connect/r/secure_file_priv.result
  mysql-test/suite/connect/t/secure_file_priv.test

mysql-test/suite/connect/r/secure_file_priv.result

-CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='/media/DATA/maria-bzr/maria-10.0-connect/mysql-test/var/mysqld.1/data//t1.dbf';
+CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='DATADIR/t1.dbf';
 ERROR HY000: The MariaDB server is running with the --secure-file-priv option so it cannot execute this statement
-CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='/media/DATA/maria-bzr/maria-10.0-connect/mysql-test/var/tmp//t1.dbf';
+CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='SECUREDATADIR/t1.dbf';
 INSERT INTO t1 VALUES (10);
 SELECT * FROM t1;
 a

mysql-test/suite/connect/t/secure_file_priv.test

-let $MYSQLD_DATADIR= `select @@datadir`;
-let $MYSQLD_SECUREDIR= `select @@secure_file_priv`;
+let $DATADIR= `select @@datadir`;
+let $SECUREDIR= `select @@secure_file_priv`;
 
+--replace_result $DATADIR DATADIR
 --error ER_OPTION_PREVENTS_STATEMENT
---eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='$MYSQLD_DATADIR/t1.dbf'
+--eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='$DATADIR/t1.dbf'
 
---eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='$MYSQLD_SECUREDIR/t1.dbf'
+--replace_result $SECUREDIR SECUREDATADIR
+--eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='$SECUREDIR/t1.dbf'
 INSERT INTO t1 VALUES (10);
 SELECT * FROM t1;
 DROP TABLE t1;
---remove_file $MYSQLD_SECUREDIR/t1.dbf
+--remove_file $SECUREDIR/t1.dbf