- Commit pulled changes

added:
  mysql-test/suite/connect/r/secure_file_priv.result
  mysql-test/suite/connect/t/secure_file_priv-master.opt
  mysql-test/suite/connect/t/secure_file_priv.test
modified:
  storage/connect/ha_connect.cc

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

+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='SECUREDATADIR/t1.dbf';
+INSERT INTO t1 VALUES (10);
+SELECT * FROM t1;
+a
+10
+DROP TABLE t1;

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

+--secure_file_priv=$MYSQL_TMP_DIR

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

+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='$DATADIR/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 $SECUREDIR/t1.dbf

storage/connect/ha_connect.cc

@@ -2912,8 +2912,17 @@ bool ha_connect::check_privileges(THD *thd, PTOS options)
     case TAB_XML:
     case TAB_INI:
     case TAB_VEC:
-      return options->filename ?
-             check_access(thd, FILE_ACL, NULL, NULL, NULL, 0, 0) : false;
+      if (!options->filename)
+        return false;
+      char path[FN_REFLEN];
+      (void) fn_format(path, options->filename, mysql_real_data_home, "",
+                       MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
+      if (!is_secure_file_path(path))
+      {
+        my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv");
+        return true;
+      }
+      /* Fall through to check FILE_ACL */
 
     case TAB_ODBC:
     case TAB_MYSQL:
@@ -4201,9 +4210,9 @@ bool ha_connect::check_if_incompatible_data(HA_CREATE_INFO *info,
   THD *thd= current_thd;
 #if 0
   if (table) {
-    PTOS options= info->option_struct;
-
-    if (options->filename)
+    PTOS options= info->option_struct;
+
+    if (options->filename)
       return COMPATIBLE_DATA_NO; 
 
     } // endif table