Commit b5622e11 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes

parent 9f04e0e6

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ prompt_user () 
 read unused

}



# We can't use diff -u as this isn't portable

# We can't use diff -u or diff -a as these are not portable



show_failed_diff ()

{
@@ -362,7 +362,7 @@ show_failed_diff () 
  then

    echo "Below are the diffs between actual and expected results:"

    echo "-------------------------------------------------------"

    $DIFF -c -a $result_file $reject_file

    $DIFF -c $result_file $reject_file

    echo "-------------------------------------------------------"

    echo "Please follow the instructions outlined at"

    echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"

mysql-test/r/rpl000002.result

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ n 
2001

2002

Server_id	Host	Port

2	127.0.0.1	9307

2	127.0.0.1	9999

id	created

1	1970-01-01 06:25:45

id	created

mysql-test/t/rpl000002.test

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use test; 
sync_with_master;

select * from t1;

connection master;

--replace_result 9307 9999 3350 9999 3351 9999

show slave hosts;

drop table t1;

save_master_pos;

sql/sql_class.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ typedef struct st_log_info 
  ~st_log_info() { pthread_mutex_destroy(&lock);}

} LOG_INFO;



class Log_event;



class MYSQL_LOG {

 private: