mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
Fixed problems found by buildbot:
- Better error from check_slave_param - Better error message from TokuDB if it can't be compiled. - Marked rpl_mixed_drop_create_temp_table and rpl_stm_drop_create_temp_table as big tests to stop timeout failures on power8 - Added sync_slave_with_master to semisync_future-7591 to ensure that slave is up to date with master before calling rpl_end. - Disabled compiler warnings from connect and mroonga and on MacOSX. Mroonga: - Fixed bug when testing if file is a normal file that can be deleted - Marked a lot of date and datetime test to not run on macosx. This is because mktime() can't handle negative years and this restricts mroonga so that it can only store dates after the year 1900.
This commit is contained in:
Monty
parent
8254f054f8
commit
654547b5b4
17 changed files with 41 additions and 2 deletions
|
|
@ -28,7 +28,7 @@
|
|||
if ($_param_value != $slave_param_value) {
|
||||
--source include/show_rpl_debug_info.inc
|
||||
--echo Wrong value for $slave_param. Expected '$slave_param_value', got '$_param_value'
|
||||
--die Wrong value for slave parameter
|
||||
--die Wrong value for slave parameter $slave_param
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# tables. Specifically when drop temporary tables and create temporary tables
|
||||
# are used.
|
||||
###################################################################################
|
||||
--source include/big_test.inc
|
||||
--source include/have_binlog_format_mixed.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/master-slave.inc
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# tables. Specifically when drop temporary tables and create temporary tables
|
||||
# are used.
|
||||
###################################################################################
|
||||
--source include/big_test.inc
|
||||
--source include/have_binlog_format_statement.inc
|
||||
--source include/master-slave.inc
|
||||
--source include/have_innodb.inc
|
||||
|
|
|
|||
|
|
@ -27,5 +27,7 @@ reset slave;
|
|||
set global rpl_semi_sync_slave_enabled = OFF;
|
||||
--connection master
|
||||
drop table t1;
|
||||
--sync_slave_with_master
|
||||
--connection master
|
||||
set global rpl_semi_sync_master_enabled = OFF;
|
||||
--source include/rpl_end.inc
|
||||
|
|
|
|||
|
|
@ -8765,7 +8765,7 @@ void ha_mroonga::remove_related_files(const char *base_path)
|
|||
if (stat(entry->d_name, &file_status) != 0) {
|
||||
continue;
|
||||
}
|
||||
if (!((file_status.st_mode & S_IFMT) && S_IFREG)) {
|
||||
if (!((file_status.st_mode & S_IFMT) & S_IFREG)) {
|
||||
continue;
|
||||
}
|
||||
if (strncmp(entry->d_name, base_path, base_path_length) == 0) {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_version_56_or_later.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
--disable_warnings
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
--disable_warnings
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
--disable_warnings
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
--source ../../include/mroonga/skip_freebsd.inc
|
||||
--source ../../include/mroonga/skip_osx.inc
|
||||
--source ../../include/mroonga/have_64bit.inc
|
||||
--source ../../include/mroonga/have_mroonga.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,16 @@ struct a {int b; int c; };
|
|||
struct a d = { .b=1, .c=2 };
|
||||
int main() { return 0; }
|
||||
" TOKUDB_OK)
|
||||
ELSE()
|
||||
IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
||||
MESSAGE(WARNING "Not Intel 64 bit CPU")
|
||||
ELSE()
|
||||
MESSAGE(WARNING "Too old CMAKE VERSION. 2.8.9 or higher is required by TokuDB")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(NOT TOKUDB_OK OR WITHOUT_TOKUDB OR WITHOUT_TOKUDB_STORAGE_ENGINE)
|
||||
MESSAGE(STATUS "TokuDB disabled")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
|
||||
|
|
|
|||
|
|
@ -184,10 +184,19 @@ jemalloc/src/jemalloc\.c: set but not used
|
|||
#
|
||||
# Connect engine
|
||||
#
|
||||
storage/connect/ha_connect\.cc: might be clobbered by ~longjmp~
|
||||
storage/connect/connect\.cc: might be clobbered by ~longjmp~
|
||||
storage/connect/filamvct\.cpp: ignoring return value of
|
||||
storage/connect/filamvct\.cpp: might be clobbered by ~longjmp~
|
||||
storage/connect/xindex\.cpp: ignoring return value of
|
||||
storage/connect/value\.cpp: always false
|
||||
|
||||
#
|
||||
# mroonga
|
||||
#
|
||||
groonga/lib/expr\.c: propagation disabled
|
||||
groonga/lib/expr\.c: PRE disabled
|
||||
groonga/lib/expr\.c: always false
|
||||
|
||||
#
|
||||
# Unexplanable (?) stuff
|
||||
|
|
@ -213,6 +222,15 @@ ctype-simple\.c : .*unary minus operator applied to unsigned type, result still
|
|||
sql/sys_vars\.cc : invalid access to non-static data member
|
||||
string3\.h : memset used with constant zero length parameter
|
||||
|
||||
#
|
||||
# Ignorable errors on mac
|
||||
#
|
||||
my_aes\.c: deprecated
|
||||
my_sha1\.cc: deprecated
|
||||
my_md5\.cc: deprecated
|
||||
my_rnd\.cc: deprecated
|
||||
mdl\.cc: invalid access
|
||||
mdl\.cc: offsetoff
|
||||
|
||||
# Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
|
||||
regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type
|
||||
|
|
|
|||
Loading…
Reference in a new issue