Commit:    064c62e4cf078cf08a40478dfe0e64bd51789e57
Author:    Johannes Schlüter <johan...@schlueters.de>         Thu, 21 Feb 2013 
16:49:28 +0100
Parents:   1e9bc5677505585173ac105c997a09c095f34d1d
Branches:  PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=064c62e4cf078cf08a40478dfe0e64bd51789e57

Log:
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)

Bugs:
https://bugs.php.net/60840

Changed paths:
  M  NEWS
  M  ext/mysqlnd/mysqlnd_alloc.c
  M  ext/mysqlnd/mysqlnd_alloc.h


Diff:
diff --git a/NEWS b/NEWS
index c9cc2b5..d8df7b6 100644
--- 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 kr...@krizalys.com, Laruence)
diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c
index 380a0fb..39c1711 100644
--- 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 6bd4385..33c0070 100644
--- 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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to