Skip to content

M
MariaDB
Commit f44eebe2 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul
Browse files
Options

Make bdb 4.4 be the default for buildheader, and add DB_DBT_APPMALLOC and... 

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

git-svn-id: file:///svn/tokudb@846 c7de825b-a66e-492c-adef-691d508d4ae1
parent 0cb6474b
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 1 deletion
buildheader/Makefile
View file @ f44eebe2
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# 3. gather the generated sample_offsets header files # 3. gather the generated sample_offsets header files
# 4. make hs # 4. make hs
BDB = 4_1 BDB = 4_4
BDBDIR = ../../berkeleydb BDBDIR = ../../berkeleydb
MYSQL_H = -I$(BDBDIR)/db-4.1.25/build_unix/ MYSQL_H = -I$(BDBDIR)/db-4.1.25/build_unix/
CFLAGS = -Wall -W -O2 -Werror -g CFLAGS = -Wall -W -O2 -Werror -g
......
buildheader/db.h_4_1
View file @ f44eebe2
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */ /* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h> #include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/ /*stdio is needed for the FILE* in db->verify*/
#include <stdio.h> #include <stdio.h>
...@@ -63,6 +64,7 @@ typedef enum { ...@@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30997 #define DB_KEYEXIST -30997
#define DB_LOCK_DEADLOCK -30996 #define DB_LOCK_DEADLOCK -30996
#define DB_NOTFOUND -30991 #define DB_NOTFOUND -30991
#define DB_DONOTINDEX -30999
#define DB_BADFORMAT -30500 #define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536 #define DB_DELETE_ANY 65536
#define DB_FIRST 10 #define DB_FIRST 10
...@@ -74,6 +76,7 @@ typedef enum { ...@@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 30 #define DB_SET 30
#define DB_SET_RANGE 32 #define DB_SET_RANGE 32
#define DB_RMW 1073741824 #define DB_RMW 1073741824
#define DB_DBT_APPMALLOC 1
#endif #endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* 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 #ifdef _TOKUDB_WRAP_H
......
buildheader/db.h_4_3
View file @ f44eebe2
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */ /* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h> #include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/ /*stdio is needed for the FILE* in db->verify*/
#include <stdio.h> #include <stdio.h>
...@@ -63,6 +64,7 @@ typedef enum { ...@@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996 #define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995 #define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989 #define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500 #define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536 #define DB_DELETE_ANY 65536
#define DB_FIRST 9 #define DB_FIRST 9
...@@ -74,6 +76,7 @@ typedef enum { ...@@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28 #define DB_SET 28
#define DB_SET_RANGE 30 #define DB_SET_RANGE 30
#define DB_RMW 536870912 #define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif #endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* 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 #ifdef _TOKUDB_WRAP_H
......
buildheader/db.h_4_4
View file @ f44eebe2
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */ /* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h> #include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/ /*stdio is needed for the FILE* in db->verify*/
#include <stdio.h> #include <stdio.h>
...@@ -63,6 +64,7 @@ typedef enum { ...@@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996 #define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995 #define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989 #define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500 #define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536 #define DB_DELETE_ANY 65536
#define DB_FIRST 9 #define DB_FIRST 9
...@@ -74,6 +76,7 @@ typedef enum { ...@@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28 #define DB_SET 28
#define DB_SET_RANGE 30 #define DB_SET_RANGE 30
#define DB_RMW 536870912 #define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif #endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* 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 #ifdef _TOKUDB_WRAP_H
......
buildheader/db.h_4_6
View file @ f44eebe2
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */ /* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h> #include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/ /*stdio is needed for the FILE* in db->verify*/
#include <stdio.h> #include <stdio.h>
...@@ -63,6 +64,7 @@ typedef enum { ...@@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996 #define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995 #define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989 #define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500 #define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536 #define DB_DELETE_ANY 65536
#define DB_FIRST 7 #define DB_FIRST 7
...@@ -74,6 +76,8 @@ typedef enum { ...@@ -74,6 +76,8 @@ typedef enum {
#define DB_SET 26 #define DB_SET 26
#define DB_SET_RANGE 27 #define DB_SET_RANGE 27
#define DB_RMW 1073741824 #define DB_RMW 1073741824
#define DB_DBT_APPMALLOC 1
#define DB_DBT_MULTIPLE 16
#endif #endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* 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 #ifdef _TOKUDB_WRAP_H
......
buildheader/make_db_h.c
View file @ f44eebe2
...@@ -70,6 +70,7 @@ void print_defines (void) { ...@@ -70,6 +70,7 @@ void print_defines (void) {
dodefine(DB_KEYEXIST); dodefine(DB_KEYEXIST);
dodefine(DB_LOCK_DEADLOCK); dodefine(DB_LOCK_DEADLOCK);
dodefine(DB_NOTFOUND); dodefine(DB_NOTFOUND);
dodefine(DB_DONOTINDEX);
printf("#define DB_BADFORMAT -30500\n"); // private tokudb printf("#define DB_BADFORMAT -30500\n"); // private tokudb
printf("#define DB_DELETE_ANY %d\n", 1<<16); // private tokudb printf("#define DB_DELETE_ANY %d\n", 1<<16); // private tokudb
...@@ -83,6 +84,11 @@ void print_defines (void) { ...@@ -83,6 +84,11 @@ void print_defines (void) {
dodefine(DB_SET); dodefine(DB_SET);
dodefine(DB_SET_RANGE); dodefine(DB_SET_RANGE);
dodefine(DB_RMW); dodefine(DB_RMW);
dodefine(DB_DBT_APPMALLOC);
#ifdef DB_DBT_MULTIPLE
dodefine(DB_DBT_MULTIPLE);
#endif
printf("#endif\n"); printf("#endif\n");
} }
......
include/db.h
View file @ f44eebe2
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
/* This code generated by make_db_h. Copyright (c) 2007 Tokutek */ /* This code generated by make_db_h. Copyright (c) 2007 Tokutek */
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved."
#include <sys/types.h> #include <sys/types.h>
/*stdio is needed for the FILE* in db->verify*/ /*stdio is needed for the FILE* in db->verify*/
#include <stdio.h> #include <stdio.h>
...@@ -63,6 +64,7 @@ typedef enum { ...@@ -63,6 +64,7 @@ typedef enum {
#define DB_KEYEXIST -30996 #define DB_KEYEXIST -30996
#define DB_LOCK_DEADLOCK -30995 #define DB_LOCK_DEADLOCK -30995
#define DB_NOTFOUND -30989 #define DB_NOTFOUND -30989
#define DB_DONOTINDEX -30998
#define DB_BADFORMAT -30500 #define DB_BADFORMAT -30500
#define DB_DELETE_ANY 65536 #define DB_DELETE_ANY 65536
#define DB_FIRST 9 #define DB_FIRST 9
...@@ -74,6 +76,7 @@ typedef enum { ...@@ -74,6 +76,7 @@ typedef enum {
#define DB_SET 28 #define DB_SET 28
#define DB_SET_RANGE 30 #define DB_SET_RANGE 30
#define DB_RMW 536870912 #define DB_RMW 536870912
#define DB_DBT_APPMALLOC 1
#endif #endif
/* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/ /* 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 #ifdef _TOKUDB_WRAP_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7