mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pilot.(none):/data/msvensson/mysql/bug28718/my50-bug28718

Browse source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
unknown 2007-06-07 14:33:13 +02:00
commit 84bc498895
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/include/uses_vardir.inc Normal file
View file

@ -0,0 +1,15 @@
#
# Some tests uses LOAD DATA with a relative path
# and need to see for example ../std_data
#
# Also if an absolute path was used, the server might be started
# with --secure-file-priv and wouldn't be allowed to LOAD a file
# outside of it's vardir anyway
#
let $datadir=
query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1);
if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
{
skip Need mysqld in MYSQLTEST_VARDIR;
}

5
mysql-test/t/backup.test
View file

@ -1,3 +1,8 @@
# The server need to be started in $MYSQLTEST_VARDIR since it
# uses ../std_data_ln/
-- source include/uses_vardir.inc
#
# This test is a bit tricky as we can't use backup table to overwrite an old
# table

6
mysql-test/t/blackhole.test
View file

@ -5,6 +5,10 @@
-- source include/not_embedded.inc
-- source include/have_blackhole.inc
# The server need to be started in $MYSQLTEST_VARDIR since it
# uses ../std_data_ln/
-- source include/uses_vardir.inc
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
@ -109,7 +113,7 @@ insert into t1 values(1);
insert ignore into t1 values(1);
replace into t1 values(100);
create table t2 (a varchar(200)) engine=blackhole;
load data infile '../std_data_ln/words.dat' into table t2;
eval load data infile '../std_data_ln/words.dat' into table t2;
alter table t1 add b int;
alter table t1 drop b;
create table t3 like t1;