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

Portability fixes

Browse Source
This commit is contained in:
unknown
2001-09-30 22:04:56 +03:00
parent 3dbd178881
commit 003ed4cfae
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.sh
View File

@ -345,7 +345,7 @@ prompt_user ()
read unused 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 () show_failed_diff ()
{ {
@ -362,7 +362,7 @@ show_failed_diff ()
then then
echo "Below are the diffs between actual and expected results:" echo "Below are the diffs between actual and expected results:"
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
$DIFF -c -a $result_file $reject_file $DIFF -c $result_file $reject_file
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
echo "Please follow the instructions outlined at" echo "Please follow the instructions outlined at"
echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html" echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html"

2
mysql-test/r/rpl000002.result
View File

@ -3,7 +3,7 @@ n
2001 2001
2002 2002
Server_id Host Port Server_id Host Port
2 127.0.0.1 9307 2 127.0.0.1 9999
id created id created
1 1970-01-01 06:25:45 1 1970-01-01 06:25:45
id created id created

1
mysql-test/t/rpl000002.test
View File

@ -11,6 +11,7 @@ use test;
sync_with_master; sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
--replace_result 9307 9999 3350 9999 3351 9999
show slave hosts; show slave hosts;
drop table t1; drop table t1;
save_master_pos; save_master_pos;

1
sql/sql_class.h
View File

@ -51,6 +51,7 @@ typedef struct st_log_info
~st_log_info() { pthread_mutex_destroy(&lock);} ~st_log_info() { pthread_mutex_destroy(&lock);}
} LOG_INFO; } LOG_INFO;
class Log_event;
class MYSQL_LOG { class MYSQL_LOG {
private: private: