From: Benjamin Pflugmann Date: September 11 2001 6:28am Subject: patch concerning comments List-Archive: http://lists.mysql.com/internals/1752 Message-Id: <20010911082816.B17966@spin.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Hi. During my work on merge-table-insert I noticed some typos and thought I put this in a separate patch. Bye, Benjamin. Can be applied with: patch -p1 -d mysql-src-dir < mail --- mysql-3.23.42/include/merge.h Sat Sep 8 21:08:17 2001 +++ mysql-3.23.42-test/include/merge.h Tue Sep 11 04:39:41 2001 @@ -43,7 +43,7 @@ ulonglong data_file_length; uint reclength; /* Recordlength */ int errkey; /* With key was dupplicated on err */ - uint options; /* HA_OPTIONS_... used */ + uint options; /* HA_OPTION_... used */ } MERGE_INFO; typedef struct st_mrg_table_info --- mysql-3.23.42/include/myisam.h Sat Sep 8 21:08:14 2001 +++ mysql-3.23.42-test/include/myisam.h Tue Sep 11 04:39:41 2001 @@ -69,7 +69,7 @@ ulonglong auto_increment; ulonglong key_map; /* Which keys are used */ uint keys; /* Number of keys in use */ - uint options; /* HA_OPTIONS_... used */ + uint options; /* HA_OPTION_... used */ int errkey, /* With key was dupplicated on err */ sortkey; /* clustered by this key */ File filenr; /* (uniq) filenr for datafile */ --- mysql-3.23.42/include/nisam.h Sat Sep 8 21:08:12 2001 +++ mysql-3.23.42-test/include/nisam.h Tue Sep 11 04:39:41 2001 @@ -57,7 +57,7 @@ uint reclength; /* Recordlength */ uint mean_reclength; /* Mean recordlength (if packed) */ uint keys; /* How many keys used */ - uint options; /* HA_OPTIONS_... used */ + uint options; /* HA_OPTION_... used */ int errkey, /* With key was dupplicated on err */ sortkey; /* clustered by this key */ File filenr; /* (uniq) filenr for datafile */ --- mysql-3.23.42/sql/handler.h Sat Sep 8 21:08:17 2001 +++ mysql-3.23.42-test/sql/handler.h Tue Sep 11 04:39:41 2001 @@ -77,7 +77,7 @@ #define HA_NO_FULLTEXT_KEY (HA_NO_PREFIX_CHAR_KEYS*2) /* Parameters for open() (in register form->filestat) */ - /* HA_GET_INFO does a implicit HA_ABORT_IF_LOCKED */ + /* HA_GET_INFO does an implicit HA_ABORT_IF_LOCKED */ #define HA_OPEN_KEYFILE 1 #define HA_OPEN_RNDFILE 2 --- mysql-3.23.42/sql/sql_table.cc Sat Sep 8 21:08:12 2001 +++ mysql-3.23.42-test/sql/sql_table.cc Tue Sep 11 04:39:41 2001 @@ -182,7 +182,7 @@ } /***************************************************************************** - * Create at table. + * Create a table. * If one creates a temporary table, this is automaticly opened ****************************************************************************/ --- mysql-3.23.42/sql/unireg.cc Sat Sep 8 21:08:15 2001 +++ mysql-3.23.42-test/sql/unireg.cc Tue Sep 11 04:39:41 2001 @@ -18,7 +18,7 @@ /* Functions to create a unireg form-file from a FIELD and a fieldname-fieldinfo struct. - In the following functions FIELD * is a ordinary field-structure with + In the following functions FIELD * is an ordinary field-structure with the following exeptions: sc_length,typepos,row,kol,dtype,regnr and field nead not to be set. str is a (long) to record position where 0 is the first position. @@ -502,7 +502,7 @@ } - /* save a empty record on start of formfile */ + /* save an empty record on start of formfile */ static bool make_empty_rec(File file,enum db_type table_type, uint table_options,