georg Tue Dec 16 03:18:32 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_fe.c mysqli_prop.c
Log:
added properties
- insert_id
- server_status
fixed bug in mysqli_execute (report func)
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.54 php-src/ext/mysqli/mysqli_api.c:1.55
--- php-src/ext/mysqli/mysqli_api.c:1.54 Sat Dec 13 11:08:13 2003
+++ php-src/ext/mysqli/mysqli_api.c Tue Dec 16 03:18:31 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.54 2003/12/13 16:08:13 georg Exp $
+ $Id: mysqli_api.c,v 1.55 2003/12/16 08:18:31 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -620,6 +620,10 @@
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_FALSE;
}
+ if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
+ php_mysqli_report_index(stmt->stmt->query,
stmt->stmt->mysql->server_status TSRMLS_CC);
+ }
+
RETURN_TRUE;
}
/* }}} */
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.22 php-src/ext/mysqli/mysqli_fe.c:1.23
--- php-src/ext/mysqli/mysqli_fe.c:1.22 Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/mysqli_fe.c Tue Dec 16 03:18:31 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.22 2003/12/13 00:28:20 georg Exp $
+ $Id: mysqli_fe.c,v 1.23 2003/12/16 08:18:31 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -172,7 +172,6 @@
PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
PHP_FALIAS(init,mysqli_init,NULL)
PHP_FALIAS(info,mysqli_info,NULL)
- PHP_FALIAS(insert_id,mysqli_insert_id,NULL)
PHP_FALIAS(kill,mysqli_kill,NULL)
PHP_FALIAS(master_query,mysqli_master_query,NULL)
PHP_FALIAS(mysqli, mysqli_connect, NULL)
@@ -242,6 +241,7 @@
PHP_FALIAS(get_metadata, mysqli_get_metadata,NULL)
PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
+ PHP_FALIAS(stmt,mysqli_prepare,NULL)
PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
{NULL, NULL, NULL}
};
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.1 php-src/ext/mysqli/mysqli_prop.c:1.2
--- php-src/ext/mysqli/mysqli_prop.c:1.1 Sat Nov 22 16:20:07 2003
+++ php-src/ext/mysqli/mysqli_prop.c Tue Dec 16 03:18:31 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_prop.c,v 1.1 2003/11/22 21:20:07 georg Exp $
+ $Id: mysqli_prop.c,v 1.2 2003/12/16 08:18:31 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -76,10 +76,12 @@
MYSQLI_MAP_PROPERTY_STRING(link_host_read, MYSQL, host);
MYSQLI_MAP_PROPERTY_STRING(link_host_info_read, MYSQL, host_info);
MYSQLI_MAP_PROPERTY_STRING(link_info_read, MYSQL, info);
+MYSQLI_MAP_PROPERTY_LONG(link_insert_id_read, MYSQL, last_used_con->insert_id);
MYSQLI_MAP_PROPERTY_LONG(link_port_read, MYSQL, port);
MYSQLI_MAP_PROPERTY_LONG(link_protocol_version_read, MYSQL, protocol_version);
MYSQLI_MAP_PROPERTY_LONG(link_server_capabilities_read, MYSQL, server_capabilities);
MYSQLI_MAP_PROPERTY_LONG(link_server_language_read, MYSQL, server_language);
+MYSQLI_MAP_PROPERTY_LONG(link_server_status_read, MYSQL, server_status);
MYSQLI_MAP_PROPERTY_STRING(link_server_version_read, MYSQL, server_version);
MYSQLI_MAP_PROPERTY_STRING(link_sqlstate_read, MYSQL, net.sqlstate);
MYSQLI_MAP_PROPERTY_LONG(link_thread_id_read, MYSQL, thread_id);
@@ -148,7 +150,9 @@
{"host", link_host_read, NULL},
{"host_info", link_host_info_read, NULL},
{"info", link_info_read, NULL},
+ {"insert_id", link_insert_id_read, NULL},
{"server_capabilities", link_server_capabilities_read, NULL},
+ {"server_status", link_server_status_read, NULL},
{"server_version", link_server_version_read, NULL},
{"sqlstate", link_sqlstate_read, NULL},
{"port", link_port_read, NULL},
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
