List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:June 6 2011 8:16pm
Subject:bzr commit into mysql-trunk branch (chris.powers:3305)
View as plain text  
#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:cpowers@tma-1-20110606195705-g1moftxfqlde495m

 3305 Christopher Powers	2011-06-06
      merge with mysql-trunk

    modified:
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
      vio/viosocket.c
=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-03-29 00:46:15 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-06-06 20:16:03 +0000
@@ -89,7 +89,8 @@ enum PSI_socket_operation
   PSI_SOCKET_SEEK= 10,
   PSI_SOCKET_OPT= 11,
   PSI_SOCKET_STAT= 12,
-  PSI_SOCKET_SHUTDOWN= 13
+  PSI_SOCKET_SHUTDOWN= 13,
+  PSI_SOCKET_SELECT= 14
 };
 typedef unsigned int PSI_mutex_key;
 typedef unsigned int PSI_rwlock_key;

=== modified file 'include/mysql/psi/psi_abi_v2.h.pp'
--- a/include/mysql/psi/psi_abi_v2.h.pp	2011-04-22 03:07:02 +0000
+++ b/include/mysql/psi/psi_abi_v2.h.pp	2011-06-06 20:16:03 +0000
@@ -89,7 +89,8 @@ enum PSI_socket_operation
   PSI_SOCKET_SEEK= 10,
   PSI_SOCKET_OPT= 11,
   PSI_SOCKET_STAT= 12,
-  PSI_SOCKET_SHUTDOWN= 13
+  PSI_SOCKET_SHUTDOWN= 13,
+  PSI_SOCKET_SELECT= 14
 };
 typedef unsigned int PSI_mutex_key;
 typedef unsigned int PSI_rwlock_key;

=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2011-06-06 19:24:25 +0000
+++ b/vio/viosocket.c	2011-06-06 20:16:03 +0000
@@ -101,7 +101,6 @@ size_t vio_read(Vio *vio, uchar *buf, si
 {
   ssize_t ret;
   int flags= 0;
-  size_t bytes_read= 0;
   DBUG_ENTER("vio_read");
 
   /* Ensure nobody uses vio_read_buff and vio_read simultaneously. */
@@ -317,7 +316,6 @@ int vio_socket_timeout(Vio *vio,
 int vio_fastsend(Vio * vio __attribute__((unused)))
 {
   int r=0;
-  my_socket sd= mysql_socket_getfd(vio->mysql_socket);
   DBUG_ENTER("vio_fastsend");
 
 #if defined(IPTOS_THROUGHPUT)


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110606201603-3axc73sibzl3ws0u.bundle
Thread
bzr commit into mysql-trunk branch (chris.powers:3305) Christopher Powers7 Jun