summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-11-18 17:42:39 +0200
committerMonty <monty@mariadb.org>2015-11-18 17:42:39 +0200
commitc2ec897745f37c1479dc9be3a2a3b476e4ed694f (patch)
tree2821a6df6614f8a4bc21f1d54ce6887f855cef5a /storage/mroonga
parentf383cbcb03c499a935f4c59dd5101b2a6470c5c6 (diff)
downloadmariadb-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 'storage/mroonga')
-rw-r--r--storage/mroonga/mysql-test/mroonga/wrapper/t/repair_table_no_index_file.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/repair_table_no_index_file.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/repair_table_no_index_file.test
index 147d9672eae..b5a7f2c860a 100644
--- a/storage/mroonga/mysql-test/mroonga/wrapper/t/repair_table_no_index_file.test
+++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/repair_table_no_index_file.test
@@ -41,6 +41,9 @@ SELECT * FROM diaries WHERE MATCH(body) AGAINST("starting");
FLUSH TABLES;
# Error ER_CANT_OPEN_FILE syscall error 'repair_test.mrn.0000104' (No such file or directory)
+# The (Error 0)[0]" replaces is for Solaris
+#
+--replace_result "(Error 0)[0]" "(No such file or directory)"
--error ER_CANT_OPEN_FILE
SELECT * FROM diaries WHERE MATCH(body) AGAINST("starting");