Skip to content

Commit 9eb15a0

Browse files
author
[email protected]
committed
sql/Makefile.am: better mysqld dependencies
sql/discover.cc: close(-1) bug sql/slave.cc: DBUG_ENTER/RETURN tags ha_archive.cc: double-close bug
1 parent 7165732 commit 9eb15a0

File tree

4 files changed

+178
-86
lines changed

4 files changed

+178
-86
lines changed

‎sql/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ LDADD = $(top_builddir)/vio/libvio.a \
3535
$(top_builddir)/dbug/libdbug.a \
3636
$(top_builddir)/regex/libregex.a \
3737
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
38-
38+
mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(LDADD)
3939
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
4040
@pstack_libs@ \
4141
@mysql_plugin_libs@ \

‎sql/discover.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ int writefrm(const char *name, const void *frmdata, uint len)
119119
{
120120
if (my_write(file,(byte*)frmdata,len,MYF(MY_WME | MY_NABP)))
121121
error= 2;
122+
VOID(my_close(file,MYF(0)));
122123
}
123-
VOID(my_close(file,MYF(0)));
124124
DBUG_RETURN(error);
125125
} /* writefrm */
126126

0 commit comments

Comments
 (0)