4914 magnus.blaudd@stripped 2012-04-13
ndb
- remove unnecessary ifdef, all versions have OPTION_ALLOW_BATCH now
modified:
sql/ha_ndbcluster.cc
4913 magnus.blaudd@stripped 2012-04-11 [merge]
Merge
removed:
mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt
modified:
mysql-test/suite/ndb/r/ndb_restore_misc.result
mysql-test/suite/ndb/t/ndb_restore_misc.test
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2012-03-27 07:02:26 +0000
+++ b/sql/ha_ndbcluster.cc 2012-04-13 09:46:42 +0000
@@ -4106,11 +4106,7 @@ bool ha_ndbcluster::isManualBinlogExec(T
static inline bool
thd_allow_batch(const THD* thd)
{
-#ifndef OPTION_ALLOW_BATCH
- return false;
-#else
return (thd_options(thd) & OPTION_ALLOW_BATCH);
-#endif
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4913 to 4914) | magnus.blaudd | 13 Apr |
