List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:October 10 2006 3:00pm
Subject:bk commit into 5.1 tree (mats:1.2348)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-10 14:58:40+02:00, mats@romeo.(none) +1 -0
  Fixes to make replication team tree build on Windows.

  sql/log_event.cc@stripped, 2006-10-10 14:58:17+02:00, mats@romeo.(none) +3 -3
    Adding casts to make it compile on Windows.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b19459-mysql-5.1-new

--- 1.245/sql/log_event.cc	2006-10-10 15:00:08 +02:00
+++ 1.246/sql/log_event.cc	2006-10-10 15:00:08 +02:00
@@ -1083,7 +1083,7 @@
                     ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
       DBUG_ASSERT(bytes_written >= 0);
       DBUG_ASSERT(static_cast<my_size_t>(bytes_written) < sizeof(emit_buf));
-      my_b_write(file, emit_buf, bytes_written);
+      my_b_write(file, (byte*) emit_buf, bytes_written);
       ptr += LOG_EVENT_MINIMAL_HEADER_LEN;
       hexdump_from += LOG_EVENT_MINIMAL_HEADER_LEN;
     }
@@ -1114,7 +1114,7 @@
                       hex_string, char_string);
         DBUG_ASSERT(bytes_written >= 0);
         DBUG_ASSERT(static_cast<my_size_t>(bytes_written) < sizeof(emit_buf));
-	my_b_write(file, emit_buf, bytes_written);
+	my_b_write(file, (byte*) emit_buf, bytes_written);
 	hex_string[0]= 0;
 	char_string[0]= 0;
 	c= char_string;
@@ -1135,7 +1135,7 @@
                     hex_string, char_string);
       DBUG_ASSERT(bytes_written >= 0);
       DBUG_ASSERT(static_cast<my_size_t>(bytes_written) < sizeof(emit_buf));
-      my_b_write(file, emit_buf, bytes_written);
+      my_b_write(file, (byte*) emit_buf, bytes_written);
     }
   }
   DBUG_VOID_RETURN;
Thread
bk commit into 5.1 tree (mats:1.2348)Mats Kindahl10 Oct