bzr commit into mysql-6.0 branch (alik:2683)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/6.0-merge/

 2683 Alexander Nozdrin	2008-08-07 [merge]
      Merge 6.0-build -> 6.0
modified:
  mysql-test/mysql-test-run.pl
  sql/probes.h
  storage/falcon/Makefile.am
  storage/falcon/MemMgr.cpp

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-07-24 14:33:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-06 08:26:05 +0000
@@ -1474,13 +1474,15 @@ sub executable_setup_ndb () {
 
   $exe_ndbd=
     mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
-			 "$ndb_path/ndbd");
+			 "$ndb_path/ndbd",
+			 "$glob_basedir/libexec/ndbd");
   $exe_ndb_mgm=
     mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
 			 "$ndb_path/ndb_mgm");
   $exe_ndb_mgmd=
     mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
-			 "$ndb_path/ndb_mgmd");
+			 "$ndb_path/ndb_mgmd",
+			 "$glob_basedir/libexec/ndb_mgmd");
   $exe_ndb_waiter=
     mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
 			 "$ndb_path/ndb_waiter");

=== modified file 'sql/probes.h'
--- a/sql/probes.h	2007-09-21 07:09:31 +0000
+++ b/sql/probes.h	2008-07-08 13:49:57 +0000
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#if _DTRACE_VERSION
+#if _DTRACE_VERSION && defined(HAVE_DTRACE)
 
 #define	MYSQL_DELETE_END() \
 	__dtrace_mysql___delete_end()

=== modified file 'storage/falcon/Makefile.am'
--- a/storage/falcon/Makefile.am	2008-07-19 03:03:39 +0000
+++ b/storage/falcon/Makefile.am	2008-07-25 12:31:16 +0000
@@ -381,7 +381,7 @@ noinst_HEADERS=	$(falcon_headers) \
 
 EXTRA_LTLIBRARIES=	ha_falcon.la
 pkglib_LTLIBRARIES=	@plugin_falcon_shared_target@
-ha_falcon_la_LDFLAGS=	-module -rpath $(pkglibdir) -lstdc++
+ha_falcon_la_LDFLAGS=	-module -rpath $(pkglibdir)
 ha_falcon_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_falcon_la_CFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_falcon_la_LIBADD=	TransformLib/libtransform.la

=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp	2008-06-19 15:09:45 +0000
+++ b/storage/falcon/MemMgr.cpp	2008-07-15 16:45:57 +0000
@@ -544,6 +544,7 @@ void* MemMgr::allocateDebug(int size, co
 		length = ROUNDUP(size, defaultRounding) + OFFSET(MemBlock*, body) + sizeof(long);
 		memory = (MemBlock*) allocRaw(length);
 		memory->pool = NULL;
+		memory->length = length;
 		}
 
 #ifdef MEM_DEBUG