3408 Ole John Aske 2011-01-17 [merge]
Merged more from mysql-5.1-telco-7.0
modified:
configure.in
mysql-test/suite/ndb/include/run_ndbapitest.inc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_cond.cc
storage/ndb/ndb_configure.m4
storage/ndb/tools/restore/consumer_restore.cpp
3407 Ole John Aske 2011-01-17 [merge]
Merge from telco-7.0
modified:
include/my_sys.h
include/mysql.h.pp
include/mysql_com.h
mysql-test/r/join_outer.result
mysql-test/suite/ndb/r/ndb_blob_big.result
mysql-test/suite/ndb/r/ndb_condition_pushdown.result
mysql-test/suite/ndb/t/ndb_blob_big.test
mysql-test/suite/ndb/t/ndb_condition_pushdown.test
mysql-test/t/join_outer.test
mysys/my_lockmem.c
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_cond.cc
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_glue.h
sql/item.h
sql/item_cmpfunc.cc
sql/item_subselect.cc
sql/rpl_utility.cc
sql/sql_select.cc
sql/sql_select.h
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
storage/ndb/include/ndb_config.h.in
storage/ndb/include/ndbapi/Ndb.hpp
storage/ndb/include/util/Bitmask.hpp
storage/ndb/ndb_configure.cmake
storage/ndb/ndb_configure.m4
storage/ndb/src/common/portlib/NdbMutex.c
storage/ndb/src/kernel/blocks/ERROR_codes.txt
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
storage/ndb/src/kernel/blocks/lgman.cpp
storage/ndb/src/kernel/blocks/tsman.cpp
storage/ndb/src/kernel/blocks/tsman.hpp
storage/ndb/src/kernel/vm/mt.cpp
storage/ndb/src/mgmsrv/ConfigManager.cpp
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/ndbapi/ClusterMgr.cpp
storage/ndb/src/ndbapi/ClusterMgr.hpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
storage/ndb/src/ndbapi/NdbImpl.hpp
storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/Ndbif.cpp
storage/ndb/src/ndbapi/SignalSender.cpp
storage/ndb/src/ndbapi/SignalSender.hpp
storage/ndb/src/ndbapi/TransporterFacade.cpp
storage/ndb/src/ndbapi/TransporterFacade.hpp
storage/ndb/src/ndbapi/trp_client.cpp
storage/ndb/src/ndbapi/trp_client.hpp
storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
storage/ndb/test/ndbapi/testBasic.cpp
storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'configure.in'
--- a/configure.in 2010-11-09 15:34:24 +0000
+++ b/configure.in 2011-01-17 13:22:06 +0000
@@ -12,7 +12,7 @@ dnl
dnl When changing the major version number please also check the switch
dnl statement in mysqlbinlog::check_master_version(). You may also need
dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.51-ndb-7.0.21], [], [mysql])
+AC_INIT([MySQL Server], [5.1.51-ndb-7.0.22], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM
# USTAR format gives us the possibility to store longer path names in
=== modified file 'mysql-test/suite/ndb/include/run_ndbapitest.inc'
--- a/mysql-test/suite/ndb/include/run_ndbapitest.inc 2010-01-07 17:39:03 +0000
+++ b/mysql-test/suite/ndb/include/run_ndbapitest.inc 2011-01-17 12:42:30 +0000
@@ -22,6 +22,11 @@ unless($test_bin)
exit(0);
}
+if ($ENV{'MYSQL_TMP_DIR'})
+{
+ $ENV{'NDBT_TMP_DIR'} = $ENV{'MYSQL_TMP_DIR'};
+}
+
my $cmd = $test_bin;
$cmd .= " $args" if $args;
$cmd .= " 2>&1";
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2011-01-17 12:08:49 +0000
+++ b/sql/ha_ndbcluster.cc 2011-01-17 14:33:23 +0000
@@ -7788,6 +7788,9 @@ int ha_ndbcluster::read_range_first_to_b
if (unlikely((error= close_scan())))
DBUG_RETURN(error);
+ if (m_active_cursor && (error= close_scan()))
+ DBUG_RETURN(error);
+
if (m_use_partition_pruning)
{
DBUG_ASSERT(!m_pushed_join);
@@ -15293,14 +15296,14 @@ ha_ndbcluster::cond_push(const Item *con
* pushable by each handler.)
*/
DBUG_EXECUTE("where",print_where((Item *)cond, "Rejected cond_push", QT_ORDINARY););
- DBUG_RETURN(NULL);
+ DBUG_RETURN(cond);
}
if (!m_cond)
m_cond= new ha_ndbcluster_cond;
if (!m_cond)
{
my_errno= HA_ERR_OUT_OF_MEM;
- DBUG_RETURN(NULL);
+ DBUG_RETURN(cond);
}
DBUG_EXECUTE("where",print_where((Item *)cond, m_tabname, QT_ORDINARY););
DBUG_RETURN(m_cond->cond_push(cond, table, (NDBTAB *)m_table));
=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc 2011-01-17 12:08:49 +0000
+++ b/sql/ha_ndbcluster_cond.cc 2011-01-17 14:33:23 +0000
@@ -972,7 +972,7 @@ ha_ndbcluster_cond::cond_push(const Item
if (ndb_cond == NULL)
{
my_errno= HA_ERR_OUT_OF_MEM;
- DBUG_RETURN(NULL);
+ DBUG_RETURN(cond);
}
if (m_cond_stack)
ndb_cond->next= m_cond_stack;
=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4 2011-01-17 12:08:49 +0000
+++ b/storage/ndb/ndb_configure.m4 2011-01-17 14:33:23 +0000
@@ -2,7 +2,7 @@
# Should be updated when creating a new NDB version
NDB_VERSION_MAJOR=7
NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=21
+NDB_VERSION_BUILD=22
NDB_VERSION_STATUS=""
dnl for build ndb docs
=== modified file 'storage/ndb/tools/restore/consumer_restore.cpp'
--- a/storage/ndb/tools/restore/consumer_restore.cpp 2010-12-03 09:36:45 +0000
+++ b/storage/ndb/tools/restore/consumer_restore.cpp 2011-01-17 13:17:32 +0000
@@ -21,6 +21,7 @@
#include <kernel/ndb_limits.h>
#include <my_sys.h>
#include <NdbSleep.h>
+#include <NdbTick.h>
#include <ndb_internal.hpp>
#include <ndb_logevent.h>
@@ -362,6 +363,7 @@ BackupRestore::rebuild_indexes(const Tab
for(size_t i = 0; i<indexes.size(); i++)
{
NdbDictionary::Index * idx = indexes[i];
+ Uint64 start = NdbTick_CurrentMillisecond();
info << "Rebuilding index " << idx->getName() << " on table "
<< tab->getName() << " ..." << flush;
if (dict->createIndex(* idx, 1) != 0)
@@ -373,7 +375,8 @@ BackupRestore::rebuild_indexes(const Tab
return false;
}
- info << "OK" << endl;
+ Uint64 stop = NdbTick_CurrentMillisecond();
+ info << "OK (" << ((stop - start)/1000) << "s)" <<endl;
}
return true;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch(ole.john.aske:3407 to 3408) | Ole John Aske | 17 Jan |
