Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)

diff --git a/NEWS b/NEWS
index c9cc2b5c93558f1abbc3c9da076c5fd9101b24dc..d8df7b68f08b871f35774c25776983bd598f3774 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,10 @@ PHP                                                                        NEWS
   . Fixed bug #61930 (openssl corrupts ssl key resource when using 
     openssl_get_publickey()). (Stas)
 
+- PDO_mysql:
+  . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
+    (Johannes)
+
 - SPL:
   . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
     (patch by kriss@krizalys.com, Laruence)

diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c
index 380a0fbaa061b7096efb8331ca98d6842b3d81a4..39c1711b0216bd61c7b3f54a215e0924a2c306ab 100644 (file)
--- a/ext/mysqlnd/mysqlnd_alloc.c
+++ b/ext/mysqlnd/mysqlnd_alloc.c
@@ -42,7 +42,7 @@ static const char mysqlnd_free_name[]         = "_mysqlnd_free";
 static const char mysqlnd_pestrndup_name[]     = "_mysqlnd_pestrndup";
 static const char mysqlnd_pestrdup_name[]      = "_mysqlnd_pestrdup";
 
-const char * mysqlnd_debug_std_no_trace_funcs[] =
+PHPAPI const char * mysqlnd_debug_std_no_trace_funcs[] =
 {
        mysqlnd_emalloc_name,
        mysqlnd_ecalloc_name,

diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h
index 6bd4385e616cab1c1eaeec2b0b1d5b77e540d916..33c007026a81d39baaf1449b1122d6e39fca952c 100644 (file)
--- a/ext/mysqlnd/mysqlnd_alloc.h
+++ b/ext/mysqlnd/mysqlnd_alloc.h
@@ -24,7 +24,7 @@
 #ifndef MYSQLND_ALLOC_H
 #define MYSQLND_ALLOC_H
 
-extern const char * mysqlnd_debug_std_no_trace_funcs[];
+PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[];
 
 #define MYSQLND_MEM_D  TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
 #define MYSQLND_MEM_C  TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC