bk commit into 5.1 tree (msvensson:1.2670)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-20 18:38:23+01:00, msvensson@stripped +6 -0
  Update path to the load_file

  mysql-test/extra/rpl_tests/rpl_log.test@stripped, 2007-12-20 18:38:09+01:00, msvensson@stripped +6 -1
    Update path to the load_file

  mysql-test/include/wait_show_pattern.inc@stripped, 2007-12-20 18:38:10+01:00, msvensson@stripped +1 -1
    Guard against ' in $result

  mysql-test/suite/rpl/r/rpl_row_log.result@stripped, 2007-12-20 18:38:11+01:00, msvensson@stripped +1 -1
    Update path to the load_file

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@stripped, 2007-12-20 18:38:13+01:00, msvensson@stripped +1 -1
    Update path to the load_file

  mysql-test/suite/rpl/r/rpl_stm_log.result@stripped, 2007-12-20 18:38:14+01:00, msvensson@stripped +1 -1
    Update path to the load_file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@stripped, 2007-12-20 18:38:16+01:00, msvensson@stripped +1 -1
    Update path to the load_file

diff -Nrup a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2007-12-12 18:18:45 +01:00
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2007-12-20 18:38:09 +01:00
@@ -32,8 +32,13 @@ reset master;
 eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
 insert into t1 values (NULL);
 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;
-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;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
diff -Nrup a/mysql-test/include/wait_show_pattern.inc b/mysql-test/include/wait_show_pattern.inc
--- a/mysql-test/include/wait_show_pattern.inc	2007-01-19 21:15:58 +01:00
+++ b/mysql-test/include/wait_show_pattern.inc	2007-12-20 18:38:10 +01:00
@@ -32,7 +32,7 @@ let $wait_counter= 150;
 while ($wait_counter)
 {
   let $result= `SHOW $show_type`;
-  let $success= `SELECT '$result' LIKE $show_pattern`;
+  let $success= `SELECT "$result" LIKE $show_pattern`;
   if ($success)
   {
     let $wait_counter= 0;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2007-12-12 18:18:52 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2007-12-20 18:38:11 +01:00
@@ -12,7 +12,7 @@ create table t1(n int not null auto_incr
 insert into t1 values (NULL);
 drop table t1;
 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;
 count(*)
 69
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2007-12-12 18:18:52 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2007-12-20 18:38:13 +01:00
@@ -12,7 +12,7 @@ create table t1(n int not null auto_incr
 insert into t1 values (NULL);
 drop table t1;
 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;
 count(*)
 69
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2007-12-12 18:18:52 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2007-12-20 18:38:14 +01:00
@@ -12,7 +12,7 @@ create table t1(n int not null auto_incr
 insert into t1 values (NULL);
 drop table t1;
 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;
 count(*)
 69
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2007-12-12 18:18:55 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2007-12-20 18:38:16 +01:00
@@ -12,7 +12,7 @@ create table t1(n int not null auto_incr
 insert into t1 values (NULL);
 drop table t1;
 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;
 count(*)
 69