diff options
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/config.m4 | 6 | ||||
| -rw-r--r-- | ext/mysqli/config.w32 | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/package.xml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index c700dac819..c5dfe5dc5a 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -31,11 +31,11 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [ PHP_ARG_WITH(mysqli, for MySQLi support, [ --with-mysqli[=FILE] Include MySQLi support. FILE is the path - to mysql_config. If no value or mysqlnd is passed + to mysql_config. If no value or mysqlnd is passed as FILE, the MySQL native driver will be used]) PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, -[ --enable-embedded-mysqli +[ --enable-embedded-mysqli MYSQLi: Enable embedded support Note: Does not work with MySQL native driver!], no, no) @@ -65,7 +65,7 @@ elif test "$PHP_MYSQLI" != "no"; then else MYSQL_LIB_CFG='--libs' fi - + if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index 9213931393..0f8e82d398 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -31,7 +31,7 @@ if (PHP_MYSQLI != "no") { PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index cbc932298b..bc72c838af 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -185,7 +185,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne MyG(num_active_persistent)++; /* clear error */ - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); + php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); goto end; } else { diff --git a/ext/mysqli/package.xml b/ext/mysqli/package.xml index bfeeb71850..d31152e3bf 100644 --- a/ext/mysqli/package.xml +++ b/ext/mysqli/package.xml @@ -30,7 +30,7 @@ package.xml added to support installation using pear installer </notes> <configureoptions> <configureoption name="with-mysqli" default="autodetect" prompt="path to mysql_config tool?"/> - <configureoption name="enable-embedded-mysqli" default="no" prompt="embedd mysql server into PHP?"/> + <configureoption name="enable-embedded-mysqli" default="no" prompt="embedd mysql server into PHP?"/> </configureoptions> <filelist> <file role="src" name="config.m4"/> @@ -104,7 +104,7 @@ package.xml added to support installation using pear installer <file role="test" name="tests/058.phpt"/> <file role="test" name="tests/059.phpt"/> <file role="test" name="tests/060.phpt"/> - <file role="test" name="tests/connect.inc"/> + <file role="test" name="tests/connect.inc"/> </filelist> <deps> <dep type="php" rel="ge" version="5" /> |