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 /sql | |
| 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 'sql')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 12aaf0a7e7d..d8970263ed7 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3291,7 +3291,7 @@ static Sys_var_charptr Sys_version_compile_machine( "version_compile_machine", "version_compile_machine", READ_ONLY SHOW_VALUE_IN_HELP GLOBAL_VAR(server_version_compile_machine_ptr), NO_CMD_LINE, - IN_SYSTEM_CHARSET, DEFAULT(MACHINE_TYPE)); + IN_SYSTEM_CHARSET, DEFAULT(DEFAULT_MACHINE)); static char *server_version_compile_os_ptr; static Sys_var_charptr Sys_version_compile_os( |