diff options
| author | unknown <jimw@mysql.com> | 2005-09-21 10:35:19 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-21 10:35:19 -0700 |
| commit | b4d5576aafe0edfbf513db82ee2f1ff478bc21e8 (patch) | |
| tree | ae48c337d2e0795f2b777946b8170db74790873d /storage/bdb/fileops/fileops.src | |
| parent | 7cc009fc8e511e722da6984c0d912a6fbf5ccfd3 (diff) | |
| parent | a22cb8d68216f9c3b88e189949c3feba543c0de8 (diff) | |
| download | mariadb-git-b4d5576aafe0edfbf513db82ee2f1ff478bc21e8.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-bdb
into mysql.com:/home/jimw/my/mysql-5.1-clean
VC++Files/storage/bdb/bdb.dsp:
Auto merged
sql/ha_berkeley.cc:
Auto merged
Diffstat (limited to 'storage/bdb/fileops/fileops.src')
| -rw-r--r-- | storage/bdb/fileops/fileops.src | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/storage/bdb/fileops/fileops.src b/storage/bdb/fileops/fileops.src index 1fd39dc3c45..a77b5d5c477 100644 --- a/storage/bdb/fileops/fileops.src +++ b/storage/bdb/fileops/fileops.src @@ -1,17 +1,15 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001-2002 + * Copyright (c) 2001-2004 * Sleepycat Software. All rights reserved. * - * $Id: fileops.src,v 1.8 2002/04/06 18:25:55 bostic Exp $ + * $Id: fileops.src,v 1.13 2004/06/17 17:35:20 bostic Exp $ */ PREFIX __fop DBPRIVATE -INCLUDE #include "db_config.h" -INCLUDE INCLUDE #ifndef NO_SYSTEM_INCLUDES INCLUDE #include <sys/types.h> INCLUDE @@ -25,7 +23,6 @@ INCLUDE #include "dbinc/db_page.h" INCLUDE #include "dbinc/db_dispatch.h" INCLUDE #include "dbinc/db_am.h" INCLUDE #include "dbinc/log.h" -INCLUDE #include "dbinc/rep.h" INCLUDE #include "dbinc/txn.h" INCLUDE #include "dbinc/fop.h" INCLUDE @@ -60,7 +57,9 @@ END * * name: file containing the page. * appname: indicates if the name needs to go through __db_appname - * offset: offset in the file. + * pgsize: page size. + * pageno: page number in the file. + * offset: offset on the page. * page: the actual meta-data page. * flag: non-0 indicates that this is a tempfile, so we needn't undo * these modifications (we'll toss the file). @@ -68,6 +67,8 @@ END BEGIN write 145 DBT name DBT s ARG appname u_int32_t lu +ARG pgsize u_int32_t lu +ARG pageno db_pgno_t lu ARG offset u_int32_t lu PGDBT page DBT s ARG flag u_int32_t lu |