diff options
| author | Monty <monty@mariadb.org> | 2015-11-18 17:42:39 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-11-18 17:42:39 +0200 |
| commit | c2ec897745f37c1479dc9be3a2a3b476e4ed694f (patch) | |
| tree | 2821a6df6614f8a4bc21f1d54ce6887f855cef5a /mysql-test/include | |
| parent | f383cbcb03c499a935f4c59dd5101b2a6470c5c6 (diff) | |
| download | mariadb-git-c2ec897745f37c1479dc9be3a2a3b476e4ed694f.tar.gz | |
Fixed buildbot failures on Solaris 64 bit
rpl/rpl_mdev382 ; Wrong replace in show_binlog_events2.inc
binlog/database ; Different error on Solaris if file exists
mroonga/repair_table_no_index_file ; Different system error on Solaris
partition_not_blackhole ; Different error on Solaris
partition_myisam ; Different error on Solaris
Some other failures in mroonga was because have_32bit.inc didn't correctly
detect 64 bits on Solaris. Fixed using DEFAULT_MACHINE instead of MACHINE_TYPE
for Sys_version_compile_machine.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/show_binlog_events2.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc index e72522dc272..b036709b81d 100644 --- a/mysql-test/include/show_binlog_events2.inc +++ b/mysql-test/include/show_binlog_events2.inc @@ -10,7 +10,8 @@ if ($binlog_file) { --let $_in_binlog_file=in '$binlog_file' } ---replace_result $_binlog_start <binlog_start> $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--let $_from_binlog_start=from $_binlog_start +--replace_result "$_from_binlog_start" "from <binlog_start>" $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_column 2 # 5 # --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/ --eval show binlog events $_in_binlog_file from $_binlog_start |