List:Commits« Previous MessageNext Message »
From:knielsen Date:January 17 2006 8:38pm
Subject:bk commit into 5.1 tree (knielsen:1.2067)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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
  1.2067 06/01/17 21:38:19 knielsen@stripped +1 -0
  C++ comments in C files are not portable.

  mysys/my_compress.c
    1.13 06/01/17 21:23:49 knielsen@stripped +2 -2
    C++ comments in C files are not portable.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new

--- 1.12/mysys/my_compress.c	2006-01-17 09:24:48 +01:00
+++ 1.13/mysys/my_compress.c	2006-01-17 21:23:49 +01:00
@@ -153,12 +153,12 @@
   if (!(blob= (struct frm_blob_struct*) my_malloc(blob_len,MYF(MY_WME))))
     goto err;
 
-  // Store compressed blob in machine independent format
+  /* Store compressed blob in machine independent format */
   int4store((char*)(&blob->head.ver), 1);
   int4store((char*)(&blob->head.orglen), comp_len);
   int4store((char*)(&blob->head.complen), org_len);
 
-  // Copy frm data into blob, already in machine independent format
+  /* Copy frm data into blob, already in machine independent format */
   memcpy(blob->data, data, org_len);
 
   *pack_data= blob;
Thread
bk commit into 5.1 tree (knielsen:1.2067)knielsen17 Jan