fixes for buildbot:
* OSX (mysqlimport freeing unallocated memory) * Windows (didn't compile MSI) * fulltest2 (innodb crashes in --embedded --big)
This commit is contained in:
parent
f41a41fd91
commit
16c4b3c68b
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/* Global Thread counter */
|
/* Global Thread counter */
|
||||||
uint counter;
|
uint counter= 0;
|
||||||
pthread_mutex_t counter_mutex;
|
pthread_mutex_t counter_mutex;
|
||||||
pthread_cond_t count_threshhold;
|
pthread_cond_t count_threshhold;
|
||||||
|
|
||||||
@ -482,6 +482,11 @@ static void safe_exit(int error, MYSQL *mysql)
|
|||||||
{
|
{
|
||||||
if (error && ignore_errors)
|
if (error && ignore_errors)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* in multi-threaded mode protect from concurrent safe_exit's */
|
||||||
|
if (counter)
|
||||||
|
pthread_mutex_lock(&counter_mutex);
|
||||||
|
|
||||||
if (mysql)
|
if (mysql)
|
||||||
mysql_close(mysql);
|
mysql_close(mysql);
|
||||||
|
|
||||||
|
@ -11,9 +11,8 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
tablespace : disabled in MariaDB (no TABLESPACE table attribute)
|
tablespace : disabled in MariaDB (no TABLESPACE table attribute)
|
||||||
events_time_zone : Test is not predictable as it depends on precise timing.
|
events_time_zone : Test is not predictable as it depends on precise timing.
|
||||||
lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
|
|
||||||
read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists
|
read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists
|
||||||
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
|
|
||||||
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
|
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
|
||||||
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
|
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
|
||||||
file_contents : MDEV-6526 these files are not installed anymore
|
file_contents : MDEV-6526 these files are not installed anymore
|
||||||
|
lowercase_fs_on : lower_case_table_names=0 is not an error until 10.1
|
||||||
|
@ -118,6 +118,7 @@ references to the clustered index record - one via the ref member, and the
|
|||||||
other via the persistent cursor. These two references must match each
|
other via the persistent cursor. These two references must match each
|
||||||
other if the found_clust flag is set.
|
other if the found_clust flag is set.
|
||||||
@return true if the persistent cursor is consistent with the ref member.*/
|
@return true if the persistent cursor is consistent with the ref member.*/
|
||||||
|
UNIV_INTERN
|
||||||
ibool
|
ibool
|
||||||
row_purge_validate_pcur(purge_node_t* node);
|
row_purge_validate_pcur(purge_node_t* node);
|
||||||
#endif /* UNIV_DEBUG */
|
#endif /* UNIV_DEBUG */
|
||||||
|
@ -826,6 +826,7 @@ other via the persistent cursor. These two references must match each
|
|||||||
other if the found_clust flag is set.
|
other if the found_clust flag is set.
|
||||||
@return true if the stored copy of persistent cursor is consistent
|
@return true if the stored copy of persistent cursor is consistent
|
||||||
with the ref member.*/
|
with the ref member.*/
|
||||||
|
UNIV_INTERN
|
||||||
ibool
|
ibool
|
||||||
row_purge_validate_pcur(
|
row_purge_validate_pcur(
|
||||||
purge_node_t* node)
|
purge_node_t* node)
|
||||||
|
@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#undef NOMINMAX
|
||||||
|
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <winreg.h>
|
#include <winreg.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user