Permalink
Browse files

merged in changes from Travers Carter as attached to ticket at http:/…

…/mysqludf.lighthouseapp.com/projects/71824/tickets/1-possible-bug#ticket-1-1

The merge and conflict resolution was done on a private repo. The conflicts occurred due to the poor release of 1.1 and the fact that this patch was for 1.0.1.

Also, there were some autoconf things that needed to be done to get these improvements to work on OSX.

*	modified:   INSTALL
*	modified:   Makefile.am
*	modified:   Makefile.in
*	modified:   config.h.in
*	new file:   config/ax_pthread.m4
*	modified:   configure
*	modified:   configure.ac
*	modified:   doc/Makefile.in
*	modified:   from_php.c
*	modified:   ghmysql.c
*	modified:   ghmysql.h
*	modified:   lib_mysqludf_preg_capture.c
*	modified:   lib_mysqludf_preg_check.c
*	modified:   lib_mysqludf_preg_info.c
*	modified:   lib_mysqludf_preg_position.c
*	modified:   lib_mysqludf_preg_replace.c
*	modified:   lib_mysqludf_preg_rlike.c
*	modified:   preg.c
*	modified:   preg.h
*	modified:   test/Makefile.in
*
* Untracked files:
*   (use "git add <file>..." to include in what will be committed)
  • Loading branch information...
1 parent d353dfe commit 8fedab74d38f8c51bb35e2337e2f25609602f4ee raw committed Mar 25, 2013
Showing with 1,242 additions and 30 deletions.
  1. +7 −0 INSTALL
  2. +2 −2 Makefile.am
  3. +7 −3 Makefile.in
  4. +22 −0 config.h.in
  5. +357 −0 config/ax_pthread.m4
  6. +612 −0 configure
  7. +3 −0 configure.ac
  8. +5 −1 doc/Makefile.in
  9. +4 −3 from_php.c
  10. +34 −1 ghmysql.c
  11. +1 −0 ghmysql.h
  12. +4 −4 lib_mysqludf_preg_capture.c
  13. +1 −1 lib_mysqludf_preg_check.c
  14. +1 −1 lib_mysqludf_preg_info.c
  15. +4 −4 lib_mysqludf_preg_position.c
  16. +11 −6 lib_mysqludf_preg_replace.c
  17. +6 −1 lib_mysqludf_preg_rlike.c
  18. +154 −2 preg.c
  19. +2 −0 preg.h
  20. +5 −1 test/Makefile.in
View
@@ -53,6 +53,13 @@ this will need to be in the LD_LIBRARY_PATH of the server. For the
make installdb
+If you receive an 'access denied' type of an error, try using something like:
+
+ make MYSQL="mysql -p" installdb
+
+to enable the ability to enter a password.
+
+
To uninstall the functions, you can use: make uninstalldb
== Run some tests ==
View
@@ -32,8 +32,8 @@ DLL_OBJS=$(CFILES:%.c=.libs/lib_mysqludf_preg_la-%.o)
SUBDIRS=test doc
DIFFPROGRAM:=kompare -
-lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@
-lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@
+lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@ @PTHREAD_CFLAGS@
+lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
EXTRA_DIST = *.sql
View
@@ -65,7 +65,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/config/ax_lib_mysql.m4 \
$(top_srcdir)/config/ax_mysql_bin.m4 \
$(top_srcdir)/config/pcre.m4 $(top_srcdir)/config/ghmysql.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/config/ax_pthread.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -315,6 +315,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_CFLAGS = @PCRE_CFLAGS@
PCRE_CONFIG = @PCRE_CONFIG@
PCRE_LIBS = @PCRE_LIBS@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -333,6 +336,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
+ax_pthread_config = @ax_pthread_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -400,8 +404,8 @@ lib_mysqludf_preg_la_SOURCES = \
DLL_OBJS = $(CFILES:%.c=.libs/lib_mysqludf_preg_la-%.o)
SUBDIRS = test doc
DIFFPROGRAM := kompare -
-lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@
-lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@
+lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@ @PTHREAD_CFLAGS@
+lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
EXTRA_DIST = *.sql
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
View
@@ -1,5 +1,11 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Is pthread_attr_get_np() declared in <pthread.h>? */
+#undef ATTRGETNP_NOT_DECLARED
+
+/* Is pthread_getattr_np declared in <pthread.h>? */
+#undef GETATTRNP_NOT_DECLARED
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -12,6 +18,18 @@
/* Define to 1 if MySQL libraries are available */
#undef HAVE_MYSQL
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Do we want a BSD-like thread-attribute interface? */
+#undef HAVE_PTHREAD_ATTR_GET_NP
+
+/* Do we want a Linux-like thread-attribute interface? */
+#undef HAVE_PTHREAD_GETATTR_NP
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -58,6 +76,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
Oops, something went wrong.

0 comments on commit 8fedab7

Please sign in to comment.