[ViewVC] Diff of: cvs/Coro-Mysql/Mysql.xs

Comparing Coro-Mysql/Mysql.xs (file contents):
Revision 1.7 by root, Thu Feb 17 02:05:15 2011 UTC vs.
Revision 1.8 by root, Thu Jul 26 21:38:00 2012 UTC

   char buf[VIO_READ_BUFFER_SIZE];
 } ourdata;
 #define OURDATAPTR (*((ourdata **)((vio)->desc + DESC_OFFSET)))
-static int
+static xlen
-our_read (Vio *vio, xgptr p, int len)
+our_read (Vio *vio, xgptr p, xlen len)
 {
   ourdata *our = OURDATAPTR;
   if (!our->bufcnt)
     {
   our->bufcnt -= len;
   return len;
 }
-static int
+static xlen
-our_write (Vio *vio, const xgptr p, int len)
+our_write (Vio *vio, cxgptr p, xlen len)
 {
   char *ptr = (char *)p;
   my_bool dummy;
   vio->vioblocking (vio, 0, &dummy);
         XPUSHs (use_ev ? &PL_sv_yes : &PL_sv_no);
 }
 void
-_patch (IV sock, int fd, SV *corohandle_sv, SV *corohandle)
+_patch (IV sock, int fd, unsigned long client_version, SV *corohandle_sv, SV *corohandle)
 	CODE:
 {
 	MYSQL *my = (MYSQL *)sock;
         Vio *vio = my->net.vio;
         ourdata *our;
+        /* matching versions are required but not sufficient */
+        if (client_version != mysql_get_client_version ())
+          croak ("DBD::mysql linked against different libmysqlclient library than Coro::Mysql (%lu vs. %lu).",
+                 client_version, mysql_get_client_version ());
         if (fd != my->net.fd)
           croak ("DBD::mysql fd and libmysql disagree - library mismatch, unsupported transport or API changes?");
         if (fd != vio->sd)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines