Commit d31e9cf7 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents ba72b450 33d29688

bdb/dist/gen_inc.awk

+11 −11
Original line number Diff line number Diff line
@@ -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 = ""

	}

ndb/src/mgmapi/Makefile.am

+0 −3
Original line number Diff line number Diff line
@@ -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.%

ndb/src/ndbapi/NdbScanOperation.cpp

+0 −2
Original line number Diff line number Diff line
@@ -664,8 +664,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 "