Commit bf0b3493 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1-fix 

into mysql.com:/home/jonas/src/wl1744


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents eb05d78d b1f4a482

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ tim@siva.hindu.god 
tim@threads.polyesthetic.msg

tim@white.box

tim@work.mysql.com

timour@mysql.com

tom@basil-firewall.home.com

tomas@mc05.(none)

tomas@poseidon.(none)

client/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 
INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la \

				@ndb_mgmclient_libs@

DEPLIB=				@ndb_mgmclient_libs@ \

				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysqladmin_SOURCES =		mysqladmin.cc

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

client/mysqladmin.c→client/mysqladmin.cc

+0 −3
Original line number Diff line number Diff line
@@ -1287,9 +1287,6 @@ static my_bool wait_pidfile(char *pidfile, time_t last_modified, 
  }

  DBUG_RETURN(error);

}

#ifdef HAVE_NDBCLUSTER_DB

/* lib linked in contains c++ code */

#ifdef __GNUC__

FIX_GCC_LINKING_PROBLEM

#endif
 
#endif

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ then 
  then

    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1

    then

      CFLAGS="$CFLAGS -DDEFINE_CXA_PURE_VIRTUAL"

      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"

    fi

  fi

heap/_check.c

+18 −5
Original line number Diff line number Diff line
@@ -102,9 +102,11 @@ static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records, 
  int error;

  uint i,found,max_links,seek,links;

  uint rec_link;				/* Only used with debugging */

  uint hash_buckets_found;

  HASH_INFO *hash_info;



  error=0;

  hash_buckets_found= 0;

  for (i=found=max_links=seek=0 ; i < records ; i++)

  {

    hash_info=hp_find_hash(&keydef->block,i);
@@ -128,21 +130,32 @@ static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records, 
	  found++;

      }

      if (links > max_links) max_links=links;

      hash_buckets_found++;

    }

  }

  if (found != records)

  {

    DBUG_PRINT("error",("Found %ld of %ld records"));

    DBUG_PRINT("error",("Found %ld of %ld records", found, records));

    error=1;

  }

  if (keydef->hash_buckets != hash_buckets_found)

  {

    DBUG_PRINT("error",("Found %ld buckets, stats shows %ld buckets",

                        hash_buckets_found, keydef->hash_buckets));

    error=1;

  }

  DBUG_PRINT("info",

	     ("records: %ld   seeks: %d   max links: %d   hitrate: %.2f",

	     ("records: %ld   seeks: %d   max links: %d   hitrate: %.2f   "

              "buckets: %d",

	      records,seek,max_links,

	      (float) seek / (float) (records ? records : 1)));

	      (float) seek / (float) (records ? records : 1), 

              hash_buckets_found));

  if (print_status)

    printf("Key: %d  records: %ld   seeks: %d   max links: %d   hitrate: %.2f\n",

    printf("Key: %d  records: %ld   seeks: %d   max links: %d   "

           "hitrate: %.2f   buckets: %d\n",

	   keynr, records, seek, max_links,

	   (float) seek / (float) (records ? records : 1));

	   (float) seek / (float) (records ? records : 1), 

           hash_buckets_found);

  return error;

}