diff options
| author | tim@localhost.polyesthetic.msg <> | 2000-08-02 13:41:34 -0400 |
|---|---|---|
| committer | tim@localhost.polyesthetic.msg <> | 2000-08-02 13:41:34 -0400 |
| commit | a5421c6e20cce4df98b50c0547899fb0d176fd2a (patch) | |
| tree | 00beed22b34697fd24ba5f00971458feb24757d9 | |
| parent | ad104589b0fdbed4fd8d5e22ed1d395e5a18004d (diff) | |
| download | mariadb-git-a5421c6e20cce4df98b50c0547899fb0d176fd2a.tar.gz | |
Fix typos that gcc allowed but other compilers choke on.
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 | ||||
| -rw-r--r-- | sql/ha_berkeley.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ed157ecd425..b5a99ae368a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1 @@ -bk@work.mysql.com -sasha@mysql.sashanet.com -sasha@work.mysql.com +tim@localhost.polyesthetic.msg diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h index d8e55995635..95851363686 100644 --- a/sql/ha_berkeley.h +++ b/sql/ha_berkeley.h @@ -51,7 +51,7 @@ class ha_berkeley: public handler int pack_row(DBT *row,const byte *record); void unpack_row(char *record, DBT *row); DBT *pack_key(DBT *key, uint keynr, char *buff, const byte *record); - DBT *pack_key(DBT *key, uint keynr, char *buff, const byte *key, + DBT *pack_key(DBT *key, uint keynr, char *buff, const byte *key_ptr, uint key_length); int remove_key(DB_TXN *trans, uint keynr, const byte *record, DBT *packed_record, DBT *prim_key); @@ -113,16 +113,16 @@ class ha_berkeley: public handler int extra(enum ha_extra_function operation); int reset(void); int external_lock(THD *thd, int lock_type); - void ha_berkeley::position(byte *record); + void position(byte *record); ha_rows records_in_range(int inx, const byte *start_key,uint start_key_len, enum ha_rkey_function start_search_flag, const byte *end_key,uint end_key_len, enum ha_rkey_function end_search_flag); - int ha_berkeley::create(const char *name, register TABLE *form, + int create(const char *name, register TABLE *form, HA_CREATE_INFO *create_info); - int ha_berkeley::delete_table(const char *name); + int delete_table(const char *name); THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); }; |