georg Sat Jun 21 09:35:26 2003 EDT
Modified files:
/php4/ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
Log:
new functions (4.1.1): mysql_sqlstate, mysql_stmt_sqlstate
Index: php4/ext/mysqli/mysqli_api.c
diff -u php4/ext/mysqli/mysqli_api.c:1.30 php4/ext/mysqli/mysqli_api.c:1.31
--- php4/ext/mysqli/mysqli_api.c:1.30 Tue Jun 10 16:03:33 2003
+++ php4/ext/mysqli/mysqli_api.c Sat Jun 21 09:35:25 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.30 2003/06/10 20:03:33 imajes Exp $
+ $Id: mysqli_api.c,v 1.31 2003/06/21 13:35:25 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1725,6 +1725,24 @@
}
/* }}} */
+/* {{{ proto string mysqli_sqlstate(resource link)
+ Returns the SQLSTATE error from previous MySQL operation */
+#if MYSQL_VERSION_ID >= 40101
+PHP_FUNCTION(mysqli_sqlstate)
+{
+ MYSQL *mysql;
+ zval *mysql_link;
+ PR_MYSQL *prmysql;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_link, mysqli_link_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link,
"mysqli_link");
+ RETURN_STRING((char *)mysql_sqlstate(mysql),1);
+}
+#endif
+/* }}} */
+
/* {{{ proto string mysqli_ssl_set(resource link [,string key [,string cert [,string
ca [,string capath [,string cipher]]]]])
*/
PHP_FUNCTION(mysqli_ssl_set)
@@ -1817,6 +1835,25 @@
}
RETURN_TRUE;
}
+/* }}} */
+
+/* {{{ proto string mysqli_stmt_error(resource stmt)
+*/
+#if MYSQL_VERSION_ID >= 40101
+PHP_FUNCTION(mysqli_stmt_sqlstate)
+{
+ STMT *stmt;
+ zval *mysql_stmt;
+ PR_STMT *prstmt;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt,
"mysqli_stmt");
+
+ RETURN_STRING((char *)mysql_stmt_sqlstate(stmt->stmt),1);
+}
+#endif
/* }}} */
/* {{{ proto resource mysqli_store_result(resource link)
Index: php4/ext/mysqli/mysqli_fe.c
diff -u php4/ext/mysqli/mysqli_fe.c:1.11 php4/ext/mysqli/mysqli_fe.c:1.12
--- php4/ext/mysqli/mysqli_fe.c:1.11 Tue Jun 10 16:03:33 2003
+++ php4/ext/mysqli/mysqli_fe.c Sat Jun 21 09:35:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.11 2003/06/10 20:03:33 imajes Exp $
+ $Id: mysqli_fe.c,v 1.12 2003/06/21 13:35:26 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -104,12 +104,19 @@
PHP_FE(mysqli_send_query,
NULL)
PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL)
PHP_FE(mysqli_slave_query,
NULL)
+
+#if MYSQL_VERSION_ID >= 40101
+ PHP_FE(mysqli_sqlstate,
NULL)
+#endif
PHP_FE(mysqli_ssl_set,
NULL)
PHP_FE(mysqli_stat,
NULL)
PHP_FE(mysqli_stmt_affected_rows, NULL)
PHP_FE(mysqli_stmt_close,
NULL)
PHP_FE(mysqli_stmt_errno,
NULL)
PHP_FE(mysqli_stmt_error,
NULL)
+#if MYSQL_VERSION_ID >= 40101
+ PHP_FE(mysqli_stmt_sqlstate, NULL)
+#endif
PHP_FE(mysqli_store_result,
NULL)
PHP_FE(mysqli_stmt_store_result, NULL)
PHP_FE(mysqli_thread_id,
NULL)
@@ -168,6 +175,9 @@
PHP_FALIAS(select_db,mysqli_select_db,NULL)
PHP_FALIAS(set_opt, mysqli_options,NULL)
PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
+#if MYSQL_VERSION_ID >= 40101
+ PHP_FALIAS(sqlstate, mysqli_sqlstate,NULL)
+#endif
PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
PHP_FALIAS(stat,mysqli_stat,NULL)
PHP_FALIAS(store_result,mysqli_store_result,NULL)
@@ -221,6 +231,9 @@
PHP_FALIAS(close,mysqli_stmt_close,NULL)
PHP_FALIAS(errno,mysqli_stmt_errno,NULL)
PHP_FALIAS(error,mysqli_stmt_error,NULL)
+#if MYSQL_VERSION_ID >= 40101
+ PHP_FALIAS(sqlstate, mysqli_stmt_sqlstate,NULL)
+#endif
{NULL, NULL, NULL}
};
/* }}} */
Index: php4/ext/mysqli/php_mysqli.h
diff -u php4/ext/mysqli/php_mysqli.h:1.15 php4/ext/mysqli/php_mysqli.h:1.16
--- php4/ext/mysqli/php_mysqli.h:1.15 Tue Jun 10 16:03:33 2003
+++ php4/ext/mysqli/php_mysqli.h Sat Jun 21 09:35:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.15 2003/06/10 20:03:33 imajes Exp $
+ $Id: php_mysqli.h,v 1.16 2003/06/21 13:35:26 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -254,12 +254,18 @@
PHP_FUNCTION(mysqli_send_long_data);
PHP_FUNCTION(mysqli_send_query);
PHP_FUNCTION(mysqli_slave_query);
+#if MYSQL_VERSION_ID >= 40101
+PHP_FUNCTION(mysqli_sqlstate);
+#endif
PHP_FUNCTION(mysqli_ssl_set);
PHP_FUNCTION(mysqli_stat);
PHP_FUNCTION(mysqli_stmt_affected_rows);
PHP_FUNCTION(mysqli_stmt_close);
PHP_FUNCTION(mysqli_stmt_errno);
PHP_FUNCTION(mysqli_stmt_error);
+#if MYSQL_VERSION_ID >= 40101
+PHP_FUNCTION(mysqli_stmt_sqlstate);
+#endif
PHP_FUNCTION(mysqli_stmt_store_result);
PHP_FUNCTION(mysqli_store_result);
PHP_FUNCTION(mysqli_thread_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
