From: Date: March 4 2007 4:21am
Subject: PHP mysqlnd svn commit: r87 - trunk/ext/mysqli/mysqlnd
List-Archive: http://lists.mysql.com/commits/21095
Message-Id: <200703040321.l243Lk8J000674@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: ahristov
Date: 2007-03-04 04:21:46 +0100 (Sun, 04 Mar 2007)
New Revision: 87

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd.c
   trunk/ext/mysqli/mysqlnd/mysqlnd.h
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
   trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c
   trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.h
Log:
Coding style fixes


Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-03 17:00:33 UTC (rev 86)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-04 03:21:46 UTC (rev 87)
@@ -1048,7 +1048,7 @@
 
 /* {{{ mysqlnd_fetch_lengths_unbuffered */
 static
-unsigned long * mysqlnd_fetch_lengths_unbuffered(MYSQLND_RES * result)
+unsigned long * mysqlnd_fetch_lengths_unbuffered(MYSQLND_RES * const result)
 {
 	return result->lengths;
 }
@@ -1063,7 +1063,7 @@
   completeness.
 */
 static 
-unsigned long * mysqlnd_fetch_lengths_buffered(MYSQLND_RES *result)
+unsigned long * mysqlnd_fetch_lengths_buffered(MYSQLND_RES * const result)
 {
 	int i;
 	zval **previous_row;
@@ -1557,7 +1557,7 @@
 
 /* {{{ _mysqlnd_dump_debug_info */
 static enum_func_status
-_mysqlnd_dump_debug_info(MYSQLND *conn TSRMLS_DC)
+_mysqlnd_dump_debug_info(MYSQLND * const conn TSRMLS_DC)
 {
 	return mysqlnd_simple_command(conn, COM_DEBUG, NULL, 0, PROT_EOF_PACKET, FALSE TSRMLS_CC);
 }
@@ -1566,7 +1566,7 @@
 
 /* {{{ _mysqlnd_select_db */
 static enum_func_status
-_mysqlnd_select_db(MYSQLND *conn, const char * const db, unsigned int db_len TSRMLS_DC)
+_mysqlnd_select_db(MYSQLND * const conn, const char * const db, unsigned int db_len TSRMLS_DC)
 {
 	enum_func_status ret;
 	ret = mysqlnd_simple_command(conn, COM_INIT_DB, db, db_len, PROT_OK_PACKET, FALSE TSRMLS_CC);
@@ -1574,7 +1574,7 @@
 	  The server sends 0 but libmysql doesn't read it and has established
 	  a protocol of giving back -1. Thus we have to follow it :(
 	*/
-	conn->upsert_status.affected_rows = -1;
+	SET_ERROR_AFF_ROWS(conn);
 
 	return ret;
 }
@@ -1583,7 +1583,7 @@
 
 /* {{{ _mysqlnd_ping */
 static enum_func_status
-_mysqlnd_ping(MYSQLND *conn TSRMLS_DC)
+_mysqlnd_ping(MYSQLND * const conn TSRMLS_DC)
 {
 	enum_func_status ret;
 	ret = mysqlnd_simple_command(conn, COM_PING, NULL, 0, PROT_OK_PACKET, FALSE TSRMLS_CC);
@@ -1591,7 +1591,7 @@
 	  The server sends 0 but libmysql doesn't read it and has established
 	  a protocol of giving back -1. Thus we have to follow it :(
 	*/
-	conn->upsert_status.affected_rows = -1;
+	SET_ERROR_AFF_ROWS(conn);
 
 	return ret;
 }
@@ -1650,21 +1650,9 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_refresh */
-static enum_func_status
-_mysqlnd_refresh(MYSQLND *conn, unsigned long options TSRMLS_DC)
-{
-	zend_uchar bits[1];
-	int1store(bits, options);
-
-	return mysqlnd_simple_command(conn, COM_REFRESH, (char *)bits, 1, PROT_OK_PACKET, FALSE TSRMLS_CC);
-}
-/* }}} */
-
-
 /* {{{ _mysqlnd_set_charset */
 static enum_func_status
-_mysqlnd_set_charset(MYSQLND *conn, const char * const csname TSRMLS_DC)
+_mysqlnd_set_charset(MYSQLND * const conn, const char * const csname TSRMLS_DC)
 {
 	char query[MAX_CHARSET_LEN + 12];
 	const MYSQLND_CHARSET * const charset = mysqlnd_find_charset_name(csname);
@@ -1688,9 +1676,21 @@
 /* }}} */
 
 
+/* {{{ _mysqlnd_refresh */
+static enum_func_status
+_mysqlnd_refresh(MYSQLND * const conn, unsigned long options TSRMLS_DC)
+{
+	zend_uchar bits[1];
+	int1store(bits, options);
+
+	return mysqlnd_simple_command(conn, COM_REFRESH, (char *)bits, 1, PROT_OK_PACKET, FALSE TSRMLS_CC);
+}
+/* }}} */
+
+
 /* {{{ _mysqlnd_shutdown */
 static enum_func_status
-_mysqlnd_shutdown(MYSQLND *conn, unsigned long level TSRMLS_DC)
+_mysqlnd_shutdown(MYSQLND * const conn, unsigned long level TSRMLS_DC)
 {
 	zend_uchar bits[1];
 	int1store(bits, level);
@@ -2031,7 +2031,7 @@
 
 /* {{{ _mysqlnd_change_user */
 static enum_func_status
-_mysqlnd_change_user(MYSQLND *conn, const char *user, const char *passwd, const char *db TSRMLS_DC)
+_mysqlnd_change_user(MYSQLND * const conn, const char *user, const char *passwd, const char *db TSRMLS_DC)
 {
 	/*
 	  User could be max 16 * 3 (utf8), pass is 20 usually, db is up to 64*3

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.h
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.h	2007-03-03 17:00:33 UTC (rev 86)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.h	2007-03-04 03:21:46 UTC (rev 87)
@@ -479,7 +479,7 @@
 
 struct st_mysqlnd_connection_methods {
 	ulong				(*escape_string)(const MYSQLND * const conn, char *newstr, char *escapestr, int escapestr_len);
-	enum_func_status	(*set_charset)(MYSQLND *conn, const char * const charset TSRMLS_DC);
+	enum_func_status	(*set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC);
 	enum_func_status	(*query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC);
 	MYSQLND_RES *		(*use_result)(MYSQLND * const conn TSRMLS_DC);
 	MYSQLND_RES *		(*store_result)(MYSQLND * const conn TSRMLS_DC);
@@ -488,20 +488,20 @@
 
 	MYSQLND_STMT *		(*stmt_init)(MYSQLND * const conn);
 
-	enum_func_status	(*shutdown_server)(MYSQLND *conn, unsigned long level TSRMLS_DC);
-	enum_func_status	(*refresh_server)(MYSQLND *conn, unsigned long options TSRMLS_DC);
+	enum_func_status	(*shutdown_server)(MYSQLND * const conn, unsigned long level TSRMLS_DC);
+	enum_func_status	(*refresh_server)(MYSQLND * const conn, unsigned long options TSRMLS_DC);
 
-	enum_func_status	(*ping)(MYSQLND *conn TSRMLS_DC);
+	enum_func_status	(*ping)(MYSQLND * const conn TSRMLS_DC);
 	enum_func_status	(*kill_connection)(MYSQLND *conn, unsigned long pid TSRMLS_DC);
-	enum_func_status	(*select_db)(MYSQLND *conn, const char * const db, unsigned int db_len TSRMLS_DC);
-	enum_func_status	(*server_dump_debug_information)(MYSQLND *conn TSRMLS_DC);
-	enum_func_status	(*change_user)(MYSQLND *conn, const char * user, const char * passwd, const char * db TSRMLS_DC);
+	enum_func_status	(*select_db)(MYSQLND * const conn, const char * const db, unsigned int db_len TSRMLS_DC);
+	enum_func_status	(*server_dump_debug_information)(MYSQLND * const conn TSRMLS_DC);
+	enum_func_status	(*change_user)(MYSQLND * const conn, const char * user, const char * passwd, const char * db TSRMLS_DC);
 
 	unsigned int		(*get_error_no)(const MYSQLND * const conn);
 	const char *		(*get_error_str)(const MYSQLND * const conn);
 	const char *		(*get_sqlstate)(const MYSQLND * const conn);
 	mynd_ulonglong		(*get_thread_id)(const MYSQLND * const conn);
-	void				(*get_statistics)(MYSQLND *conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
+	void				(*get_statistics)(const MYSQLND * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
 
 	unsigned long		(*get_server_version)(const MYSQLND * const conn);
 	const char *		(*get_server_information)(const MYSQLND * const conn);
@@ -538,7 +538,7 @@
 	MYSQLND_FIELD *		(*fetch_field_direct)(const MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET fieldnr);
 
 	MYSQLND_ROW 		(*fetch_row_old_way)(MYSQLND_RES * result TSRMLS_DC ZEND_FILE_LINE_DC);
-	unsigned long *		(*fetch_lengths)(MYSQLND_RES * result);
+	unsigned long *		(*fetch_lengths)(MYSQLND_RES * const result);
 	void				(*free_result_buffers)(MYSQLND_RES * result);
 	enum_func_status	(*free_result)(MYSQLND_RES *result TSRMLS_DC);
 };

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-03 17:00:33 UTC (rev 86)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-04 03:21:46 UTC (rev 87)
@@ -793,6 +793,11 @@
 
 	mysqlnd_internal_free_stmt_content(stmt TSRMLS_CC);
 	if (stmt->stmt_id) {
+		/* unbuffered set not fetched to the end ? Clean the line */
+		if (stmt->result) {
+			stmt->result->m.skip_result(stmt->result TSRMLS_CC);
+		}
+
 		int4store(cmd_buf, stmt->stmt_id);
 		if (conn->state == CONN_READY &&
 			FAIL == mysqlnd_simple_command(conn, COM_STMT_CLOSE, (char *)cmd_buf, sizeof(cmd_buf),

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c	2007-03-03 17:00:33 UTC (rev 86)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c	2007-03-04 03:21:46 UTC (rev 87)
@@ -65,7 +65,7 @@
 
 
 static void
-mysqlnd_fill_stats_hash(MYSQLND_STATS *stats, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
+mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
 {
 	unsigned int i;
 
@@ -93,7 +93,7 @@
 
 
 /* {{{ _mysqlnd_get_connection_stats */
-void _mysqlnd_get_connection_stats(MYSQLND *conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
+void _mysqlnd_get_connection_stats(const MYSQLND * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
 {
 	mysqlnd_fill_stats_hash(&(conn->stats), return_value TSRMLS_CC ZEND_FILE_LINE_CC);
 }

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.h
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.h	2007-03-03 17:00:33 UTC (rev 86)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.h	2007-03-04 03:21:46 UTC (rev 87)
@@ -114,7 +114,7 @@
 #endif
 
 
-void _mysqlnd_get_connection_stats(MYSQLND *conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
+void _mysqlnd_get_connection_stats(const MYSQLND * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
 
 #endif	/* MYSQLND_STATISTICS_H */