mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make bdb 4.4 be the default for buildheader, and add DB_DBT_APPMALLOC and DB_DBT_MULITPLE. Fixes #96, #97.

Browse source 
git-svn-id: file:///svn/tokudb@846 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2007-11-30 05:04:06 +00:00
parent 0cb6474b8c
commit f44eebe2ae
7 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildheader/Makefile
View file

@ -11,7 +11,7 @@
# 3. gather the generated sample_offsets header files
# 4. make hs
BDB = 4_1
BDB = 4_4
BDBDIR = ../../berkeleydb
MYSQL_H = -I$(BDBDIR)/db-4.1.25/build_unix/
CFLAGS = -Wall -W -O2 -Werror -g

3
buildheader/db.h_4_1
View file

@ -1,6 +1,7 @@
#ifndef _DB_H
#define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/
#include <stdio.h>
@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30997
#define DB_LOCK_DEADLOCK -30996
#define DB_NOTFOUND -30991
#define DB_DONOTINDEX -30999
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 10
@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 30
#define DB_SET_RANGE 32
#define DB_RMW 1073741824
#define DB_DBT_APPMALLOC 1
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H

3
buildheader/db.h_4_3
View file

@ -1,6 +1,7 @@
#ifndef _DB_H
#define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/
#include <stdio.h>
@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28
#define DB_SET_RANGE 30
#define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H

3
buildheader/db.h_4_4
View file

@ -1,6 +1,7 @@
#ifndef _DB_H
#define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/
#include <stdio.h>
@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28
#define DB_SET_RANGE 30
#define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H

4
buildheader/db.h_4_6
View file

@ -1,6 +1,7 @@
#ifndef _DB_H
#define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/
#include <stdio.h>
@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 7
@ -74,6 +76,8 @@ typedef enum {
#define DB_SET 26
#define DB_SET_RANGE 27
#define DB_RMW 1073741824
#define DB_DBT_APPMALLOC 1
#define DB_DBT_MULTIPLE 16
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H

6
buildheader/make_db_h.c
View file

@ -70,6 +70,7 @@ void print_defines (void) {
dodefine(DB_KEYEXIST);
dodefine(DB_LOCK_DEADLOCK);
dodefine(DB_NOTFOUND);
dodefine(DB_DONOTINDEX);
printf("#define DB_BADFORMAT -30500\n"); // private tokudb
printf("#define DB_DELETE_ANY %d\n", 1<<16); // private tokudb
@ -83,6 +84,11 @@ void print_defines (void) {
dodefine(DB_SET);
dodefine(DB_SET_RANGE);
dodefine(DB_RMW);
dodefine(DB_DBT_APPMALLOC);
#ifdef DB_DBT_MULTIPLE
dodefine(DB_DBT_MULTIPLE);
#endif
printf("#endif\n");
}

3
include/db.h
View file

@ -1,6 +1,7 @@
#ifndef _DB_H
#define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/
#include <stdio.h>
@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536
#define DB_FIRST 9
@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28
#define DB_SET_RANGE 30
#define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/
#ifdef _TOKUDB_WRAP_H