diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-30 22:04:56 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-30 22:04:56 +0300 |
| commit | 003ed4cfaecf0c80dc2ced8593e869076cd8c34d (patch) | |
| tree | 16c8b4edbfac2e62ad94def8d240326f03c24395 | |
| parent | 3dbd178881d1d4c0fc7ee878c0fb6dab1fc5b10d (diff) | |
| download | mariadb-git-003ed4cfaecf0c80dc2ced8593e869076cd8c34d.tar.gz | |
Portability fixes
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl000002.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000002.test | 1 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3bfdbb0349a..97767a33687 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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" diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result index 7f518a7339e..89119708499 100644 --- a/mysql-test/r/rpl000002.result +++ b/mysql-test/r/rpl000002.result @@ -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 diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl000002.test index 865aa5e5bab..5840b1998a8 100644 --- a/mysql-test/t/rpl000002.test +++ b/mysql-test/t/rpl000002.test @@ -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; diff --git a/sql/sql_class.h b/sql/sql_class.h index 0104a251f2c..b34b97b29a0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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: |