PHP mysqlnd svn commit: r506 - in trunk: php5/ext/mysql php5/ext/mysqli php6/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Tue Jun 26 2007 - 16:38:03 EDT

Author: ahristov
Date: 2007-06-26 22:38:02 +0200 (Tue, 26 Jun 2007) New Revision: 506

Modified:

   trunk/php5/ext/mysql/php_mysql.c
   trunk/php5/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli.c

Log:
Let's be explicit which client library is used

Modified: trunk/php5/ext/mysql/php_mysql.c

---

• trunk/php5/ext/mysql/php_mysql.c 2007-06-26 19:45:25 UTC (rev 505) +++ trunk/php5/ext/mysql/php_mysql.c 2007-06-26 20:38:02 UTC (rev 506) @@ -514,6 +514,13 @@ snprintf(buf, sizeof(buf), "%ld", MySG(num_links)); php_info_print_table_row(2, "Active Links", buf); php_info_print_table_row(2, "Client API version", mysql_get_client_info()); + php_info_print_table_row(2, "Client library",
  +#if !defined(HAVE_MYSQLND)
  + "libmysql"
  +#else
  + "mysqlnd"
  +#endif
  + ); #if !defined (PHP_WIN32) && !defined (NETWARE) && !defined(HAVE_MYSQLND) php_info_print_table_row(2, "MYSQL_MODULE_TYPE", PHP_MYSQL_TYPE); php_info_print_table_row(2, "MYSQL_SOCKET", MYSQL_UNIX_ADDR); @@ -772,7 +779,7 @@ #ifndef HAVE_MYSQLND if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else - if (mysqlnd_connect(mysql->conn, host, user, passwd, 0, NULL, 0, + if (mysqlnd_connect(mysql->conn, host, user, passwd, 0, NULL, 0, port, socket, client_flags, MySG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) #endif {

Modified: trunk/php5/ext/mysqli/mysqli.c

---

• trunk/php5/ext/mysqli/mysqli.c 2007-06-26 19:45:25 UTC (rev 505) +++ trunk/php5/ext/mysqli/mysqli.c 2007-06-26 20:38:02 UTC (rev 506) @@ -807,7 +807,14 @@ php_info_print_table_start(); php_info_print_table_header(2, "MysqlI Support", "enabled"); php_info_print_table_row(2, "Client API library version", mysql_get_client_info()); + php_info_print_table_row(2, "Client library", #if !defined(HAVE_MYSQLND) + "libmysql"
  +#else
  + "mysqlnd"
  +#endif
  + );
  +#if !defined(HAVE_MYSQLND)
  php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION); php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR); #else

Modified: trunk/php6/ext/mysqli/mysqli.c

---

• trunk/php6/ext/mysqli/mysqli.c 2007-06-26 19:45:25 UTC (rev 505) +++ trunk/php6/ext/mysqli/mysqli.c 2007-06-26 20:38:02 UTC (rev 506) @@ -816,7 +816,14 @@ php_info_print_table_start(); php_info_print_table_header(2, "MysqlI Support", "enabled"); php_info_print_table_row(2, "Client API library version", mysql_get_client_info()); + php_info_print_table_row(2, "Client library", #if !defined(HAVE_MYSQLND) + "libmysql"
  +#else
  + "mysqlnd"
  +#endif
  + );
  +#if !defined(HAVE_MYSQLND)
  php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION); php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR); #else

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Tue Jun 26 16:40:56 2007