diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-08-11 21:49:23 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-08-11 21:49:23 +0400 |
| commit | 25a453493b38a5d5ff3bbe001ee2119a6c3da11a (patch) | |
| tree | ae542fd1085963730ebb0dd471a9e7e811651505 | |
| parent | ec5c569103aca010816834426b9f56752f33a1c1 (diff) | |
| download | mariadb-git-25a453493b38a5d5ff3bbe001ee2119a6c3da11a.tar.gz | |
Fix for bug #4307: bdb will not compile on FreeBSD 5 because of ancient awk
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
| -rw-r--r-- | bdb/dist/gen_inc.awk | 22 | ||||
| -rw-r--r-- | ndb/src/mgmapi/Makefile.am | 3 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/bdb/dist/gen_inc.awk b/bdb/dist/gen_inc.awk index 4d245623bee..2f5b491cda1 100644 --- a/bdb/dist/gen_inc.awk +++ b/bdb/dist/gen_inc.awk @@ -18,20 +18,20 @@ # i_pfile include file that contains internal (PUBLIC) prototypes /PUBLIC:/ { sub("^.*PUBLIC:[ ][ ]*", "") - if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") { + if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) { print $0 >> i_pfile print $0 >> i_dfile next } pline = sprintf("%s %s", pline, $0) - if (pline ~ "));") { + if (pline ~ /\)\);/) { sub("^[ ]*", "", pline) print pline >> i_pfile if (pline !~ db_version_unique_name) { - def = gensub("[ ][ ]*__P.*", "", 1, pline) - sub("^.*[ ][*]*", "", def) + sub("[ ][ ]*__P.*", "", pline) + sub("^.*[ ][*]*", "", pline) printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n", - def, def) >> i_dfile + pline, pline) >> i_dfile } pline = "" } @@ -53,20 +53,20 @@ # functions in libraries built with that configuration option. /EXTERN:/ { sub("^.*EXTERN:[ ][ ]*", "") - if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") { + if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) { print $0 >> e_pfile print $0 >> e_dfile next } eline = sprintf("%s %s", eline, $0) - if (eline ~ "));") { + if (eline ~ /\)\);/) { sub("^[ ]*", "", eline) print eline >> e_pfile - if (eline !~ db_version_unique_name && eline !~ "^int txn_") { - def = gensub("[ ][ ]*__P.*", "", 1, eline) - sub("^.*[ ][*]*", "", def) + if (eline !~ db_version_unique_name && eline !~ /^int txn_/) { + sub("[ ][ ]*__P.*", "", eline) + sub("^.*[ ][*]*", "", eline) printf("#define %s %s@DB_VERSION_UNIQUE_NAME@\n", - def, def) >> e_dfile + eline, eline) >> e_dfile } eline = "" } diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am index bf209ddccb5..0f0e1cea5d8 100644 --- a/ndb/src/mgmapi/Makefile.am +++ b/ndb/src/mgmapi/Makefile.am @@ -10,9 +10,6 @@ include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am #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 %::SCCS/s.% diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index 7d51974da7c..428c6c8ebc8 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId) void NdbScanOperation::closeScan() { - int self = pthread_self() ; - if(m_transConnection) do { if(DEBUG_NEXT_RESULT) ndbout_c("closeScan() theError.code = %d " |