summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-27 01:20:56 +0200
committerunknown <monty@donna.mysql.com>2001-01-27 01:20:56 +0200
commit52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45 (patch)
treebf79d814679a767435990f41e226728ee5927766 /sql/ha_berkeley.h
parent002b51000fcec9ff8c45afe12ddd3728f6035ff0 (diff)
downloadmariadb-git-52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45.tar.gz
Portability fixes for OPENBSD, OS2 and Windows
Docs/manual.texi: Changed TCX -> MySQL AB configure.in: New version include/my_sys.h: Fixes for OS2 ltconfig: Fixes for OS2 ltmain.sh: Fixes for OS2 mit-pthreads/net/net_internal.h: Fixes for OPENBSD mit-pthreads/net/proto_internal.h: Fixes for OPENBSD mit-pthreads/net/res_internal.h: Fixes for OPENBSD mit-pthreads/net/serv_internal.h: Fixes for OPENBSD myisammrg/myrg_open.c: MERGE didn't work on Windows mysys/my_getwd.c: Fixes for OS2 sql/field.cc: cleanup sql/field.h: Fix for new SCO compiler sql/ha_berkeley.cc: Cleanup sql/ha_berkeley.h: Portability fix sql/item_sum.h: Fix for new SCO compiler sql/log.cc: Fixes for OS2 sql/log_event.h: Fixes for OS2 sql/mysqld.cc: Fixes for OS2 sql/net_serv.cc: Fixes for OS2 sql/sql_analyse.h: Fix for new SCO compiler sql/sql_class.h: Fix for new SCO compiler sql/sql_map.h: Fix for new SCO compiler sql/sql_repl.cc: cleanup sql/sql_string.h: Fix for new SCO compiler sql/sql_table.cc: cleanup strings/longlong2str-x86.s: Fixes for openbsd
Diffstat (limited to 'sql/ha_berkeley.h')
-rw-r--r--sql/ha_berkeley.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index 12879383261..94d12dd2a56 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -64,7 +64,7 @@ class ha_berkeley: public handler
ulong max_row_length(const byte *buf);
int pack_row(DBT *row,const byte *record, bool new_row);
void unpack_row(char *record, DBT *row);
- void ha_berkeley::unpack_key(char *record, DBT *key, uint index);
+ void unpack_key(char *record, DBT *key, uint index);
DBT *create_key(DBT *key, uint keynr, char *buff, const byte *record,
int key_length = MAX_KEY_LENGTH);
DBT *pack_key(DBT *key, uint keynr, char *buff, const byte *key_ptr,
@@ -156,13 +156,12 @@ class ha_berkeley: public handler
void get_status();
inline void get_auto_primary_key(byte *to)
{
- ulonglong tmp;
pthread_mutex_lock(&share->mutex);
share->auto_ident++;
int5store(to,share->auto_ident);
pthread_mutex_unlock(&share->mutex);
}
- longlong ha_berkeley::get_auto_increment();
+ longlong get_auto_increment();
};
extern bool berkeley_skip, berkeley_shared_data;