bk commit into 5.1 tree (petr:1.2169)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.2169 06/03/17 11:30:47 petr@stripped +2 -0
  Convert methods, which don't have to be in ha_archive
  to static functions.

  sql/ha_archive.h
    1.43 06/03/17 11:30:38 petr@stripped +0 -9
    remove signatures from the class definition

  sql/ha_archive.cc
    1.85 06/03/17 11:30:38 petr@stripped +19 -10
    move the methods we don't need to be in ha_archive out
    of the class

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.1-virgin

--- 1.84/sql/ha_archive.cc	2006-02-26 00:20:51 +03:00
+++ 1.85/sql/ha_archive.cc	2006-03-17 11:30:38 +03:00
@@ -144,6 +144,15 @@
 */
 #define ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT 2
 
+static int read_meta_file(File meta_file, ha_rows *rows,
+                          ulonglong *auto_increment,
+                          ulonglong *forced_flushes);
+static int write_meta_file(File meta_file, ha_rows rows,
+                           ulonglong auto_increment,
+                           ulonglong forced_flushes,
+                           bool dirty);
+static ARCHIVE_SHARE *get_share(const char *table_name, TABLE *table, int *rc);
+static int free_share(ARCHIVE_SHARE *share);
 
 /* dummy handlerton - only to have something to return from archive_db_init */
 handlerton archive_hton = {
@@ -313,9 +322,9 @@
   This method reads the header of a meta file and returns whether or not it was successful.
   *rows will contain the current number of rows in the data file upon success.
 */
-int ha_archive::read_meta_file(File meta_file, ha_rows *rows, 
-                               ulonglong *auto_increment,
-                               ulonglong *forced_flushes)
+static int read_meta_file(File meta_file, ha_rows *rows,
+                          ulonglong *auto_increment,
+                          ulonglong *forced_flushes)
 {
   uchar meta_buffer[META_BUFFER_SIZE];
   uchar *ptr= meta_buffer;
@@ -363,10 +372,10 @@
   By setting dirty you say whether or not the file represents the actual state of the data file.
   Upon ::open() we set to dirty, and upon ::close() we set to clean.
 */
-int ha_archive::write_meta_file(File meta_file, ha_rows rows, 
-                                ulonglong auto_increment, 
-                                ulonglong forced_flushes, 
-                                bool dirty)
+static int write_meta_file(File meta_file, ha_rows rows,
+                           ulonglong auto_increment,
+                           ulonglong forced_flushes,
+                           bool dirty)
 {
   uchar meta_buffer[META_BUFFER_SIZE];
   uchar *ptr= meta_buffer;
@@ -416,8 +425,8 @@
 
   See ha_example.cc for a longer description.
 */
-ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, 
-                                     TABLE *table, int *rc)
+static ARCHIVE_SHARE *get_share(const char *table_name,
+                                TABLE *table, int *rc)
 {
   ARCHIVE_SHARE *share;
   char meta_file_name[FN_REFLEN];
@@ -500,7 +509,7 @@
   Free the share.
   See ha_example.cc for a description.
 */
-int ha_archive::free_share(ARCHIVE_SHARE *share)
+static int free_share(ARCHIVE_SHARE *share)
 {
   int rc= 0;
   DBUG_ENTER("ha_archive::free_share");

--- 1.42/sql/ha_archive.h	2006-02-15 11:59:20 +03:00
+++ 1.43/sql/ha_archive.h	2006-03-17 11:30:38 +03:00
@@ -100,15 +100,6 @@
   int rnd_next(byte *buf);
   int rnd_pos(byte * buf, byte *pos);
   int get_row(azio_stream *file_to_read, byte *buf);
-  int read_meta_file(File meta_file, ha_rows *rows, 
-                     ulonglong *auto_increment,
-                     ulonglong *forced_flushes);
-  int write_meta_file(File meta_file, ha_rows rows, 
-                      ulonglong auto_increment, 
-                      ulonglong forced_flushes, 
-                      bool dirty);
-  ARCHIVE_SHARE *get_share(const char *table_name, TABLE *table, int *rc);
-  int free_share(ARCHIVE_SHARE *share);
   bool auto_repair() const { return 1; } // For the moment we just do this
   int read_data_header(azio_stream *file_to_read);
   int write_data_header(azio_stream *file_to_write);