Commit 4933a62a authored by unknown's avatar unknown

Update path to the load_file


mysql-test/include/wait_show_pattern.inc:
  Guard against ' in $result
parent b981448e
...@@ -32,8 +32,13 @@ reset master; ...@@ -32,8 +32,13 @@ reset master;
eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type; eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
insert into t1 values (NULL); insert into t1 values (NULL);
drop table t1; drop table t1;
let $LOAD_FILE= ../../std_data/words.dat;
if (!`SELECT length(load_file('$LOAD_FILE'))`){
let $LOAD_FILE= ../$LOAD_FILE;
}
eval create table t1 (word char(20) not null)ENGINE=$engine_type; eval create table t1 (word char(20) not null)ENGINE=$engine_type;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; --replace_result $LOAD_FILE LOAD_FILE
eval load data infile '$LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
--replace_result $VERSION VERSION --replace_result $VERSION VERSION
--replace_column 2 # 5 # --replace_column 2 # 5 #
......
...@@ -32,7 +32,7 @@ let $wait_counter= 150; ...@@ -32,7 +32,7 @@ let $wait_counter= 150;
while ($wait_counter) while ($wait_counter)
{ {
let $result= `SHOW $show_type`; let $result= `SHOW $show_type`;
let $success= `SELECT '$result' LIKE $show_pattern`; let $success= `SELECT "$result" LIKE $show_pattern`;
if ($success) if ($success)
{ {
let $wait_counter= 0; let $wait_counter= 0;
......
...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; ...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
insert into t1 values (NULL); insert into t1 values (NULL);
drop table t1; drop table t1;
create table t1 (word char(20) not null)ENGINE=MyISAM; create table t1 (word char(20) not null)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; load data infile 'LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
69 69
......
...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=InnoDB; ...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=InnoDB;
insert into t1 values (NULL); insert into t1 values (NULL);
drop table t1; drop table t1;
create table t1 (word char(20) not null)ENGINE=InnoDB; create table t1 (word char(20) not null)ENGINE=InnoDB;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; load data infile 'LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
69 69
......
...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; ...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
insert into t1 values (NULL); insert into t1 values (NULL);
drop table t1; drop table t1;
create table t1 (word char(20) not null)ENGINE=MyISAM; create table t1 (word char(20) not null)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines; load data infile 'LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
69 69
......
...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=NDB; ...@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key)ENGINE=NDB;
insert into t1 values (NULL); insert into t1 values (NULL);
drop table t1; drop table t1;
create table t1 (word char(20) not null)ENGINE=NDB; create table t1 (word char(20) not null)ENGINE=NDB;
load data infile '../../../std_data/words.dat' into table t1 ignore 1 lines; load data infile 'LOAD_FILE' into table t1 ignore 1 lines;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
69 69
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment