database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code

Fix for bug #4307: bdb will not compile on FreeBSD 5 because of ancient awk

Browse Source 
and some code clean up


bdb/dist/gen_inc.awk:
  Fix for bug #4307: bdb will not compile on FreeBSD 5 because of ancient awk
ndb/src/mgmapi/Makefile.am:
  Removed unused wrong macros
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed unnesessary wrong variable assignment
This commit is contained in:
unknown 2004-08-11 21:49:23 +04:00
parent ec5c569103
commit 25a453493b
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bdb/dist/gen_inc.awk vendored
View File

@ -18,20 +18,20 @@
# i_pfile include file that contains internal (PUBLIC) prototypes # i_pfile include file that contains internal (PUBLIC) prototypes
/PUBLIC:/ { /PUBLIC:/ {
sub("^.*PUBLIC:[ ][ ]*", "") sub("^.*PUBLIC:[ ][ ]*", "")
if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") { if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) {
print $0 >> i_pfile print $0 >> i_pfile
print $0 >> i_dfile print $0 >> i_dfile
next next
} }
pline = sprintf("%s %s", pline, $0) pline = sprintf("%s %s", pline, $0)
if (pline ~ "));") { if (pline ~ /\)\);/) {
sub("^[ ]*", "", pline) sub("^[ ]*", "", pline)
print pline >> i_pfile print pline >> i_pfile
if (pline !~ db_version_unique_name) { if (pline !~ db_version_unique_name) {
def = gensub("[ ][ ]*__P.*", "", 1, pline) sub("[ ][ ]*__P.*", "", pline)
sub("^.*[ ][*]*", "", def) sub("^.*[ ][*]*", "", pline)
printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n", printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n",
def, def) >> i_dfile pline, pline) >> i_dfile
} }
pline = "" pline = ""
} }
@ -53,20 +53,20 @@
# functions in libraries built with that configuration option. # functions in libraries built with that configuration option.
/EXTERN:/ { /EXTERN:/ {
sub("^.*EXTERN:[ ][ ]*", "") sub("^.*EXTERN:[ ][ ]*", "")
if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") { if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) {
print $0 >> e_pfile print $0 >> e_pfile
print $0 >> e_dfile print $0 >> e_dfile
next next
} }
eline = sprintf("%s %s", eline, $0) eline = sprintf("%s %s", eline, $0)
if (eline ~ "));") { if (eline ~ /\)\);/) {
sub("^[ ]*", "", eline) sub("^[ ]*", "", eline)
print eline >> e_pfile print eline >> e_pfile
if (eline !~ db_version_unique_name && eline !~ "^int txn_") { if (eline !~ db_version_unique_name && eline !~ /^int txn_/) {
def = gensub("[ ][ ]*__P.*", "", 1, eline) sub("[ ][ ]*__P.*", "", eline)
sub("^.*[ ][*]*", "", def) sub("^.*[ ][*]*", "", eline)
printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n", printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n",
def, def) >> e_dfile eline, eline) >> e_dfile
} }
eline = "" eline = ""
} }

3
ndb/src/mgmapi/Makefile.am
View File

@ -10,9 +10,6 @@ include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am
#ndbtest_PROGRAMS = ndb_test_mgmapi #ndbtest_PROGRAMS = ndb_test_mgmapi
ndb_test_mgmapi_SOURCES = test_mgmapi.cpp
ndb_test_mgmapi_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/ndb/src/libndbclient.la
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

2
ndb/src/ndbapi/NdbScanOperation.cpp
View File

@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId)
void NdbScanOperation::closeScan() void NdbScanOperation::closeScan()
{ {
int self = pthread_self() ;
if(m_transConnection) do { if(m_transConnection) do {
if(DEBUG_NEXT_RESULT) if(DEBUG_NEXT_RESULT)
ndbout_c("closeScan() theError.code = %d " ndbout_c("closeScan() theError.code = %d "