Commit cecc1803 authored by Michael Widenius's avatar Michael Widenius

Fixed that 'make distcheck' works with automake 1.11.11

Fixed compiler warnings found by buildbot

Makefile.am:
  Removed extra empty line
cmd-line-utils/libedit/sys.h:
  Fixed that strndup() doesn't give compiler warnings
mysql-test/Makefile.am:
  Fixes for 'make distcheck'
plugin/auth_pam/auth_pam.c:
  Ensure that prototype for strndup() is included on linux
sql/share/Makefile.am:
  Fixes for 'make distcheck'
storage/innodb_plugin/btr/btr0sea.c:
  Fixed compiler warning
support-files/Makefile.am:
  Fixes for 'make distcheck'
parent 57bf5aa5
...@@ -277,7 +277,6 @@ API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql.h \ ...@@ -277,7 +277,6 @@ API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql.h \
TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \ TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \
$(top_srcdir)/sql/mysql_priv.h $(top_srcdir)/sql/mysql_priv.h
# #
# Rules for checking that the abi/api has not changed. # Rules for checking that the abi/api has not changed.
......
...@@ -40,6 +40,17 @@ ...@@ -40,6 +40,17 @@
#ifndef _h_sys #ifndef _h_sys
#define _h_sys #define _h_sys
#ifdef __linux__
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#endif
#ifndef __USE_XOPEN
#define __USE_XOPEN
#endif
#ifdef HAVE_SYS_CDEFS_H #ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
#endif #endif
...@@ -92,17 +103,6 @@ size_t strlcpy(char *dst, const char *src, size_t size); ...@@ -92,17 +103,6 @@ size_t strlcpy(char *dst, const char *src, size_t size);
char *fgetln(FILE *fp, size_t *len); char *fgetln(FILE *fp, size_t *len);
#endif #endif
#ifdef __linux__
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#endif
#ifndef __USE_XOPEN
#define __USE_XOPEN
#endif
#include <wchar.h> #include <wchar.h>
#include <wctype.h> #include <wctype.h>
......
...@@ -144,6 +144,8 @@ install-data-local: ...@@ -144,6 +144,8 @@ install-data-local:
uninstall-local: uninstall-local:
@RM@ -f -r $(DESTDIR)$(testdir) @RM@ -f -r $(DESTDIR)$(testdir)
uninstall-am: uninstall-local
# mtr - a shortcut for executing mysql-test-run.pl # mtr - a shortcut for executing mysql-test-run.pl
mtr: mtr:
$(RM) -f mtr $(RM) -f mtr
......
#ifndef _GNU_SOURCE
#define _GNU_SOURCE /* For strndup() */
#endif
#include <mysql/plugin_auth.h> #include <mysql/plugin_auth.h>
#include <string.h> #include <string.h>
#include <my_config.h> #include <my_config.h>
......
...@@ -49,6 +49,7 @@ install-data-local: ...@@ -49,6 +49,7 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
# FIXME maybe shouldn't remove, could be needed by other installation? # FIXME maybe shouldn't remove, could be needed by other installation?
# Note that this removes the directory that support-files are using!
uninstall-local: uninstall-local:
@RM@ -f -r $(DESTDIR)$(pkgdatadir) @RM@ -f -r $(DESTDIR)$(pkgdatadir)
......
...@@ -827,7 +827,7 @@ btr_search_guess_on_hash( ...@@ -827,7 +827,7 @@ btr_search_guess_on_hash(
mtr_t* mtr) /*!< in: mtr */ mtr_t* mtr) /*!< in: mtr */
{ {
buf_block_t* block; buf_block_t* block;
const rec_t* rec; rec_t* rec;
ulint fold; ulint fold;
dulint index_id; dulint index_id;
#ifdef notdefined #ifdef notdefined
...@@ -913,7 +913,7 @@ btr_search_guess_on_hash( ...@@ -913,7 +913,7 @@ btr_search_guess_on_hash(
ut_ad(page_rec_is_user_rec(rec)); ut_ad(page_rec_is_user_rec(rec));
btr_cur_position(index, (rec_t*) rec, block, cursor); btr_cur_position(index, rec, block, cursor);
/* Check the validity of the guess within the page */ /* Check the validity of the guess within the page */
......
...@@ -85,6 +85,9 @@ mysql-@VERSION@.spec: mysql.spec ...@@ -85,6 +85,9 @@ mysql-@VERSION@.spec: mysql.spec
rm -f $@ rm -f $@
cp mysql.spec $@ cp mysql.spec $@
# We don't need to uninstall as sql/share/Makefile.am is doing that for us
uninstall-am:
SUFFIXES = .sh SUFFIXES = .sh
.sh: .sh:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment