1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql

Browse Source 
BitKeeper/etc/ignore:
  auto-union
This commit is contained in:
unknown 2001-08-11 11:54:23 +03:00
commit 48d48eac0b
3 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.bzrignore
View File

@ -8,14 +8,18 @@
*.lo *.lo
*.o *.o
*.spec *.spec
*/*_pure_*warnings
*/.pure
*~ *~
.*.swp .*.swp
.deps .deps
.gdb_history .gdb_history
.gdbinit
.libs .libs
.o .o
.out .out
.snprj/* .snprj/*
.vimrc
BitKeeper/etc/config BitKeeper/etc/config
BitKeeper/etc/csets BitKeeper/etc/csets
BitKeeper/etc/csets-in BitKeeper/etc/csets-in
@ -119,6 +123,8 @@ bdb/include/gen_server_ext.h
bdb/include/hash_auto.h bdb/include/hash_auto.h
bdb/include/log_auto.h bdb/include/log_auto.h
bdb/include/qam_auto.h bdb/include/qam_auto.h
bdb/include/rpc_client_ext.h
bdb/include/rpc_server_ext.h
bdb/include/txn_auto.h bdb/include/txn_auto.h
bdb/java/src/com/sleepycat/db/DbConstants.java bdb/java/src/com/sleepycat/db/DbConstants.java
bdb/log/log_auto.c bdb/log/log_auto.c
@ -166,6 +172,7 @@ heap/hp_test2
include/my_config.h include/my_config.h
include/my_global.h include/my_global.h
include/mysql_version.h include/mysql_version.h
include/widec.h
innobase/ib_config.h innobase/ib_config.h
innobase/ib_config.h.in innobase/ib_config.h.in
isam/isamchk isam/isamchk
@ -199,6 +206,8 @@ myisam/mi_test_all
myisam/myisamchk myisam/myisamchk
myisam/myisamlog myisam/myisamlog
myisam/myisampack myisam/myisampack
myisam/test1.MYD
myisam/test1.MYI
mysql-test/gmon.out mysql-test/gmon.out
mysql-test/install_test_db mysql-test/install_test_db
mysql-test/mysql-test-run mysql-test/mysql-test-run
@ -287,10 +296,3 @@ support-files/mysql.server
support-files/mysql.spec support-files/mysql.spec
tags tags
tmp/* tmp/*
myisam/test1.MYD
myisam/test1.MYI
.gdbinit
.vimrc
*/.pure
*/*_pure_*warnings
include/widec.h

19
bdb/include/rpc_client_ext.h
View File

@ -1,19 +0,0 @@
/* DO NOT EDIT: automatically built by dist/s_include. */
#ifndef _rpc_client_ext_h_
#define _rpc_client_ext_h_
#if defined(__cplusplus)
extern "C" {
#endif
int __dbcl_envserver __P((DB_ENV *, char *, long, long, u_int32_t));
int __dbcl_refresh __P((DB_ENV *));
int __dbcl_txn_close __P((DB_ENV *));
void __dbcl_txn_end __P((DB_TXN *));
int __dbcl_c_destroy __P((DBC *));
void __dbcl_c_refresh __P((DBC *));
int __dbcl_c_setup __P((long, DB *, DBC **));
int __dbcl_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t));
int __dbcl_dbclose_common __P((DB *));
#if defined(__cplusplus)
}
#endif
#endif /* _rpc_client_ext_h_ */

21
bdb/include/rpc_server_ext.h
View File

@ -1,21 +0,0 @@
/* DO NOT EDIT: automatically built by dist/s_include. */
#ifndef _rpc_server_ext_h_
#define _rpc_server_ext_h_
#if defined(__cplusplus)
extern "C" {
#endif
void __db_stats_freelist __P((__db_stat_statsreplist **));
void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
void __dbsrv_timeout __P((int));
void __dbclear_ctp __P((ct_entry *));
void __dbdel_ctp __P((ct_entry *));
ct_entry *new_ct_ent __P((u_int32_t *));
ct_entry *get_tableent __P((long));
void __dbsrv_active __P((ct_entry *));
int __dbc_close_int __P((ct_entry *));
int __dbenv_close_int __P((long, int));
char *get_home __P((char *));
#if defined(__cplusplus)
}
#endif
#endif /* _rpc_server_ext_h_ */