PHP mysqlnd svn commit: r453 - trunk/mysqlnd

From: <ahristov(at)mysql.com>
Date: Fri Jun 22 2007 - 09:19:23 EDT

Author: ahristov
Date: 2007-06-22 15:19:23 +0200 (Fri, 22 Jun 2007) New Revision: 453

Modified:

   trunk/mysqlnd/mysqlnd_ps.c
   trunk/mysqlnd/mysqlnd_ps_codec.c
   trunk/mysqlnd/mysqlnd_result.c

Log:
Less warnings on windows

Modified: trunk/mysqlnd/mysqlnd_ps.c

---

• trunk/mysqlnd/mysqlnd_ps.c 2007-06-22 12:48:27 UTC (rev 452) +++ trunk/mysqlnd/mysqlnd_ps.c 2007-06-22 13:19:23 UTC (rev 453)
  @@ -966,7 +966,7 @@
  Maybe we can make it automatic by checking what's the value of max_allowed_packet_size on the server and resending the data. */ -#if HAVE_USLEEP +#if HAVE_USLEEP && !defined(PHP_WIN32) usleep(120000); #endif if ((packet_len = php_mysqlnd_consume_uneaten_data(conn, cmd TSRMLS_CC))) {

Modified: trunk/mysqlnd/mysqlnd_ps_codec.c

---

• trunk/mysqlnd/mysqlnd_ps_codec.c 2007-06-22 12:48:27 UTC (rev 452) +++ trunk/mysqlnd/mysqlnd_ps_codec.c 2007-06-22 13:19:23 UTC (rev 453)
  @@ -188,7 +188,8 @@
  } #endif } else { - ZVAL_LONG(zv, llval); + /* This cast is safe, as we have checked the values above */ + ZVAL_LONG(zv, (long) llval); } (*row)+= 8; }
  @@ -728,7 +729,8 @@
  int4store(p, stmt->stmt_id); p += 4;
  • int1store(p, stmt->flags); + /* flags is 4 bytes, we store just 1 */ + int1store(p, (zend_uchar) stmt->flags); p++;

         /* Make it all zero */

Modified: trunk/mysqlnd/mysqlnd_result.c

---

• trunk/mysqlnd/mysqlnd_result.c 2007-06-22 12:48:27 UTC (rev 452) +++ trunk/mysqlnd/mysqlnd_result.c 2007-06-22 13:19:23 UTC (rev 453)
  @@ -691,7 +691,7 @@
  zval **current_row;

 		if (!free_rows) {
-			unsigned long total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33% */
+			mynd_ulonglong total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33% */
 			total_rows += set->row_count;
 			set->data = perealloc(set->data, total_rows * sizeof(zval **), set->persistent);
 

@@ -741,10 +741,10 @@

 	/* save some memory */
 	if (free_rows) {
 		set->data = perealloc(set->data,
-							  set->row_count * sizeof(zval **),
+							  (size_t) set->row_count * sizeof(zval **),
 							  set->persistent);
 		set->row_buffers = perealloc(set->row_buffers,
-									 set->row_count * sizeof(zend_uchar *),
+									 (size_t) set->row_count * sizeof(zend_uchar *),
 									 set->persistent);
 	}
 

@@ -979,7 +979,7 @@

 		RETURN_NULL();
 	}	
 
-	mysqlnd_array_init(return_value, result->data->row_count);
+	mysqlnd_array_init(return_value, (uint) result->data->row_count);
 
 	while (result->data->data_cursor &&
 		   (result->data->data_cursor - result->data->data) < result->data->row_count)

-- 
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 Fri Jun 22 09:21:06 2007