mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildbot found failures

Browse source 
config.h.cmake:
  define NOMINMAX, otherwise Windows system headers define min() and max() macros
sql/slave.cc:
  mi->report() has one more argument in MariaDB
storage/xtradb/buf/buf0flu.cc:
  xtradb fixes for windows, again
This commit is contained in:
Sergei Golubchik 2014-08-08 13:53:43 +02:00
parent ffd9c77e08
commit 9fffe990c4
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.h.cmake
View file

@ -520,6 +520,11 @@
#endif
#define PSAPI_VERSION 1 /* for GetProcessMemoryInfo() */
/* We don't want the min/max macros */
#ifdef __WIN__
#define NOMINMAX
#endif
/*
MySQL features
*/

2
sql/slave.cc
View file

@ -1785,7 +1785,7 @@ when it try to get the value of TIME_ZONE global variable from master.";
if (is_network_error(mysql_errno(mysql)))
{
IF_DBUG(heartbeat_network_error: , )
mi->report(WARNING_LEVEL, mysql_errno(mysql),
mi->report(WARNING_LEVEL, mysql_errno(mysql), NULL,
"SET @master_heartbeat_period to master failed with error: %s",
mysql_error(mysql));
mysql_free_result(mysql_store_result(mysql));

3
storage/xtradb/buf/buf0flu.cc
View file

@ -1365,9 +1365,6 @@ buf_flush_page_and_try_neighbors(
ut_a(buf_page_in_file(bpage)
|| (buf_page_get_state(bpage) == BUF_BLOCK_REMOVE_HASH
#ifdef UNIV_DEBUG
&& !mutex_own(&buf_pool->LRU_list_mutex)
#endif
));
if (buf_flush_ready_for_flush(bpage, flush_type)) {