database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/mysqld.cc:
  Manual merge of OPT_SECUREE_FILE_PRIV
sql/set_var.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge, change is already in 5.1
sql/sql_class.h:
  Manual mergem change is already in 5.1
This commit is contained in:
unknown
2007-02-14 14:51:49 +01:00
parent 581db6c18a 555aed64aa
commit fe46b0ff6c
16 changed files with 133 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/t/loaddata.test
View File

@@ -114,6 +114,29 @@ truncate table t1;
load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (@dummy,@n) set a= @n, c= (select str from t2 where num=@n);
select * from t1;
#
# Bug#18628 mysql-test-run: security problem
#
# 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;
--error 1238
set @@secure_file_priv= 0;
# Test "load data"
truncate table t1;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--error 1290
eval load data infile '$MYSQL_TEST_DIR/Makefile' into table t1;
select * from t1;
# Test "load_file" returns NULL
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval select load_file("$MYSQL_TEST_DIR/Makefile");
# cleanup
drop table t1, t2;