database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Update path to the load_file

Browse Source 
mysql-test/include/wait_show_pattern.inc:
  Guard against ' in $result
This commit is contained in:
unknown
2007-12-20 18:38:23 +01:00
parent b981448e5d
commit 4933a62af6
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/extra/rpl_tests/rpl_log.test
View File

@ -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 #

2
mysql-test/include/wait_show_pattern.inc
View File

@ -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;

2
mysql-test/suite/rpl/r/rpl_row_log.result
View File

@ -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

2
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View File

@ -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

2
mysql-test/suite/rpl/r/rpl_stm_log.result
View File

@ -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

2
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
View File

@ -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