diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/sys.h | 22 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 2 | ||||
| -rw-r--r-- | plugin/auth_pam/auth_pam.c | 4 | ||||
| -rw-r--r-- | sql/share/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/innodb_plugin/btr/btr0sea.c | 4 | ||||
| -rw-r--r-- | support-files/Makefile.am | 3 |
7 files changed, 23 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index cc1156fce5a..f0b617fcb66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -277,7 +277,6 @@ API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql.h \ TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \ $(top_srcdir)/sql/mysql_priv.h - # # Rules for checking that the abi/api has not changed. diff --git a/cmd-line-utils/libedit/sys.h b/cmd-line-utils/libedit/sys.h index 33638d1565b..af55bcd7202 100644 --- a/cmd-line-utils/libedit/sys.h +++ b/cmd-line-utils/libedit/sys.h @@ -40,6 +40,17 @@ #ifndef _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 #include <sys/cdefs.h> #endif @@ -92,17 +103,6 @@ size_t strlcpy(char *dst, const char *src, size_t size); char *fgetln(FILE *fp, size_t *len); #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 <wctype.h> diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 6a1e677fd79..e1780982b8c 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -144,6 +144,8 @@ install-data-local: uninstall-local: @RM@ -f -r $(DESTDIR)$(testdir) +uninstall-am: uninstall-local + # mtr - a shortcut for executing mysql-test-run.pl mtr: $(RM) -f mtr diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c index ee13b37f793..de62ebf8dbd 100644 --- a/plugin/auth_pam/auth_pam.c +++ b/plugin/auth_pam/auth_pam.c @@ -1,3 +1,7 @@ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE /* For strndup() */ +#endif + #include <mysql/plugin_auth.h> #include <string.h> #include <my_config.h> diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 892a720900e..8b7792481e6 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -49,6 +49,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets # FIXME maybe shouldn't remove, could be needed by other installation? +# Note that this removes the directory that support-files are using! uninstall-local: @RM@ -f -r $(DESTDIR)$(pkgdatadir) diff --git a/storage/innodb_plugin/btr/btr0sea.c b/storage/innodb_plugin/btr/btr0sea.c index 3dd30cbc0f3..04c273344f3 100644 --- a/storage/innodb_plugin/btr/btr0sea.c +++ b/storage/innodb_plugin/btr/btr0sea.c @@ -827,7 +827,7 @@ btr_search_guess_on_hash( mtr_t* mtr) /*!< in: mtr */ { buf_block_t* block; - const rec_t* rec; + rec_t* rec; ulint fold; dulint index_id; #ifdef notdefined @@ -913,7 +913,7 @@ btr_search_guess_on_hash( 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 */ diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 6b5dfbd7d8d..821ba7ffac9 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -85,6 +85,9 @@ mysql-@VERSION@.spec: mysql.spec rm -f $@ cp mysql.spec $@ +# We don't need to uninstall as sql/share/Makefile.am is doing that for us +uninstall-am: + SUFFIXES = .sh .sh: |