Skip to content

Commit 16c4b3c

Browse files
committed
fixes for buildbot:
* OSX (mysqlimport freeing unallocated memory) * Windows (didn't compile MSI) * fulltest2 (innodb crashes in --embedded --big)
1 parent f41a41f commit 16c4b3c

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

client/mysqlimport.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
/* Global Thread counter */
39-
uint counter;
39+
uint counter= 0;
4040
pthread_mutex_t counter_mutex;
4141
pthread_cond_t count_threshhold;
4242

@@ -482,6 +482,11 @@ static void safe_exit(int error, MYSQL *mysql)
482482
{
483483
if (error && ignore_errors)
484484
return;
485+
486+
/* in multi-threaded mode protect from concurrent safe_exit's */
487+
if (counter)
488+
pthread_mutex_lock(&counter_mutex);
489+
485490
if (mysql)
486491
mysql_close(mysql);
487492

mysql-test/disabled.def

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
##############################################################################
1212
tablespace : disabled in MariaDB (no TABLESPACE table attribute)
1313
events_time_zone : Test is not predictable as it depends on precise timing.
14-
lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX
1514
read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists
16-
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
1715
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
1816
mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
1917
file_contents : MDEV-6526 these files are not installed anymore
18+
lowercase_fs_on : lower_case_table_names=0 is not an error until 10.1

storage/xtradb/include/row0purge.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ references to the clustered index record - one via the ref member, and the
118118
other via the persistent cursor. These two references must match each
119119
other if the found_clust flag is set.
120120
@return true if the persistent cursor is consistent with the ref member.*/
121+
UNIV_INTERN
121122
ibool
122123
row_purge_validate_pcur(purge_node_t* node);
123124
#endif /* UNIV_DEBUG */

storage/xtradb/row/row0purge.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,7 @@ other via the persistent cursor. These two references must match each
826826
other if the found_clust flag is set.
827827
@return true if the stored copy of persistent cursor is consistent
828828
with the ref member.*/
829+
UNIV_INTERN
829830
ibool
830831
row_purge_validate_pcur(
831832
purge_node_t* node)

win/packaging/ca/CustomAction.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1717
#define UNICODE
1818
#endif
1919

20+
#undef NOMINMAX
21+
2022
#include <winsock2.h>
2123
#include <windows.h>
2224
#include <winreg.h>

0 commit comments

Comments
 (0)