List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:April 1 2011 11:53am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4265)
View as plain text  
#At file:///home/msvensson/mysql/7.0-ndbzio/ based on revid:magnus.blaudd@strippedss

 4265 Magnus Blåudd	2011-04-01
      ndbzio
       - remove azwrite_frm, azread_frm, azwrite_comment and azread_comment
        which are unused by NDB

    modified:
      storage/ndb/include/util/ndbzio.h
      storage/ndb/src/common/util/ndbzio.c
=== modified file 'storage/ndb/include/util/ndbzio.h'
--- a/storage/ndb/include/util/ndbzio.h	2011-04-01 11:50:32 +0000
+++ b/storage/ndb/include/util/ndbzio.h	2011-04-01 11:53:43 +0000
@@ -182,11 +182,6 @@ extern int azclose(azio_stream *file);
    error number (see function gzerror below).
 */
 
-extern int azwrite_frm (azio_stream *s, char *blob, unsigned int length);
-extern int azread_frm (azio_stream *s, char *blob);
-extern int azwrite_comment (azio_stream *s, char *blob, unsigned int length);
-extern int azread_comment (azio_stream *s, char *blob);
-
 #ifdef	__cplusplus
 }
 #endif

=== modified file 'storage/ndb/src/common/util/ndbzio.c'
--- a/storage/ndb/src/common/util/ndbzio.c	2011-04-01 11:48:13 +0000
+++ b/storage/ndb/src/common/util/ndbzio.c	2011-04-01 11:53:43 +0000
@@ -1040,66 +1040,3 @@ int azclose (azio_stream *s)
   return destroy(s);
 }
 
-/*
-  Though this was added to support MySQL's FRM file, anything can be 
-  stored in this location.
-*/
-int azwrite_frm(azio_stream *s, char *blob, unsigned int length)
-{
-  if (s->mode == 'r') 
-    return 1;
-
-  if (s->rows > 0) 
-    return 1;
-
-  s->frm_start_pos= (uint) s->start;
-  s->frm_length= length;
-  s->start+= length;
-
-  my_pwrite(s->file, (uchar*) blob, s->frm_length, s->frm_start_pos, MYF(0));
-
-  write_header(s);
-  my_seek(s->file, 0, MY_SEEK_END, MYF(0));
-
-  return 0;
-}
-
-int azread_frm(azio_stream *s, char *blob)
-{
-  my_pread(s->file, (uchar*) blob, s->frm_length, s->frm_start_pos, MYF(0));
-
-  return 0;
-}
-
-
-/*
-  Simple comment field
-*/
-int azwrite_comment(azio_stream *s, char *blob, unsigned int length)
-{
-  if (s->mode == 'r') 
-    return 1;
-
-  if (s->rows > 0) 
-    return 1;
-
-  s->comment_start_pos= (uint) s->start;
-  s->comment_length= length;
-  s->start+= length;
-
-  my_pwrite(s->file, (uchar*) blob, s->comment_length, s->comment_start_pos,
-            MYF(0));
-
-  write_header(s);
-  my_seek(s->file, 0, MY_SEEK_END, MYF(0));
-
-  return 0;
-}
-
-int azread_comment(azio_stream *s, char *blob)
-{
-  my_pread(s->file, (uchar*) blob, s->comment_length, s->comment_start_pos,
-           MYF(0));
-
-  return 0;
-}

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110401115343-mqvkgczqel36l950.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4265) Magnus Blåudd1 Apr