diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/pdo_mysql/pdo_mysql.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/pdo_mysql/pdo_mysql.c')
| -rw-r--r-- | ext/pdo_mysql/pdo_mysql.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 1c94058535..012cea9866 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -45,7 +45,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql) With libmysql `mysql_config --socket` will fill PDO_MYSQL_UNIX_ADDR and the user can use --with-mysql-sock=SOCKET which will fill PDO_MYSQL_UNIX_ADDR. If both aren't set we're using mysqlnd and use - /tmp/mysql.sock as default on *nix and NULL for Windows (default + /tmp/mysql.sock as default on *nix and NULL for Windows (default named pipe name is set in mysqlnd). */ #ifndef PDO_MYSQL_UNIX_ADDR @@ -101,8 +101,8 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* true global environment */ - +/* true global environment */ + /* {{{ PHP_MINIT_FUNCTION */ static PHP_MINIT_FUNCTION(pdo_mysql) @@ -110,7 +110,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql) REGISTER_INI_ENTRIES(); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (zend_long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY); - REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (zend_long)PDO_MYSQL_ATTR_LOCAL_INFILE); + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (zend_long)PDO_MYSQL_ATTR_LOCAL_INFILE); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_INIT_COMMAND", (zend_long)PDO_MYSQL_ATTR_INIT_COMMAND); #ifndef PDO_USE_MYSQLND REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MAX_BUFFER_SIZE", (zend_long)PDO_MYSQL_ATTR_MAX_BUFFER_SIZE); @@ -174,7 +174,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(pdo_mysql) -{ +{ if (PDO_MYSQL_G(debug)) { MYSQLND_DEBUG *dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs); if (!dbg) { @@ -183,7 +183,7 @@ static PHP_RINIT_FUNCTION(pdo_mysql) dbg->m->set_mode(dbg, PDO_MYSQL_G(debug)); PDO_MYSQL_G(dbg) = dbg; } - + return SUCCESS; } /* }}} */ |