diff options
| author | Andrey Hristov <andrey@php.net> | 2008-01-29 11:59:53 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-01-29 11:59:53 +0000 |
| commit | 00877eff13cdc174724afa3955439742dbf26102 (patch) | |
| tree | a54f56629ade353dfc85338e199a0403bbe043a5 /ext/mysqlnd/mysqlnd.c | |
| parent | 9770b3cb00fc015d05e21cb151642d37dace9d3d (diff) | |
| download | php-git-00877eff13cdc174724afa3955439742dbf26102.tar.gz | |
Moved initialization code into a function.
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 3c779f6d59..9f22912356 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -133,10 +133,7 @@ void mysqlnd_library_init(TSRMLS_D) mysqlnd_library_initted = TRUE; _mysqlnd_init_ps_subsystem(); /* Should be calloc, as mnd_calloc will reference LOCK_access*/ - mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS)); -#ifdef ZTS - mysqlnd_global_stats->LOCK_access = tsrm_mutex_alloc(); -#endif + mysqlnd_stats_init(&mysqlnd_global_stats); } } /* }}} */ @@ -146,11 +143,7 @@ void mysqlnd_library_init(TSRMLS_D) void mysqlnd_library_end(TSRMLS_D) { if (mysqlnd_library_initted == TRUE) { -#ifdef ZTS - tsrm_mutex_free(mysqlnd_global_stats->LOCK_access); -#endif - /* mnd_free will reference LOCK_access and crash...*/ - free(mysqlnd_global_stats); + mysqlnd_stats_end(mysqlnd_global_stats); mysqlnd_global_stats = NULL; mysqlnd_library_initted = FALSE; } |