From: Jonas Oreland
Date: September 6 2011 10:29am
Subject: bzr push into mysql-5.5-cluster branch (jonas.oreland:3461 to 3464)
List-Archive: http://lists.mysql.com/commits/140924
Message-Id: <20110906102952.0DA8591C3B5@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
3464 Jonas Oreland 2011-09-06 [merge]
ndb - merge 71 to 55
modified:
storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties
storage/ndb/clusterj/pom.xml
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
storage/ndb/ndb_configure.cmake
3463 Jonas Oreland 2011-09-06
ndb - disable index statistics (for now) in tests not explicitly wanting it
modified:
mysql-test/suite/ndb/include/ndb_add_node_mysqld.cnf
mysql-test/suite/ndb/t/ndb_addnode.cnf
mysql-test/suite/ndb_binlog/my.cnf
mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf
mysql-test/suite/ndb_rpl/my.cnf
mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
mysql-test/suite/ndb_team/my.cnf
mysql-test/suite/rpl_ndb/my.cnf
3462 Jonas Oreland 2011-09-06
ndb - "fix" ndb_update_no_read normal vs. ps-protocol
modified:
mysql-test/suite/ndb/r/ndb_update_no_read.result
mysql-test/suite/ndb/t/ndb_update_no_read.test
sql/ha_ndbcluster.cc
3461 Jonas Oreland 2011-09-05
ndb - fix ndb_read_multi_range normal vs. ps-protocol
modified:
mysql-test/suite/ndb/r/ndb_read_multi_range.result
mysql-test/suite/ndb/t/ndb_read_multi_range.test
=== modified file 'mysql-test/suite/ndb/include/ndb_add_node_mysqld.cnf'
--- a/mysql-test/suite/ndb/include/ndb_add_node_mysqld.cnf 2009-03-26 08:21:55 +0000
+++ b/mysql-test/suite/ndb/include/ndb_add_node_mysqld.cnf 2011-09-06 10:10:36 +0000
@@ -18,3 +18,4 @@ loose-innodb_data_file_path= ibdata
slave-net-timeout=120
log-bin=mysqld-bin
+ndb-index-stat-enable=0
=== modified file 'mysql-test/suite/ndb/r/ndb_update_no_read.result'
--- a/mysql-test/suite/ndb/r/ndb_update_no_read.result 2011-06-09 12:14:22 +0000
+++ b/mysql-test/suite/ndb/r/ndb_update_no_read.result 2011-09-06 08:37:44 +0000
@@ -443,6 +443,8 @@ analyze table t1;
Table Op Msg_type Msg_text
test.t1 analyze status OK
affected rows: 1
+set autocommit=off;
+affected rows: 0
select count(*) from t1 where a in (...)
count(*)
1000
@@ -450,6 +452,8 @@ affected rows: 1
@ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
5
affected rows: 1
+set autocommit=on;
+affected rows: 0
update t1 set c = 'kalle' where a in (...)
affected rows: 1000
info: Rows matched: 1000 Changed: 1000 Warnings: 0
=== modified file 'mysql-test/suite/ndb/t/ndb_addnode.cnf'
--- a/mysql-test/suite/ndb/t/ndb_addnode.cnf 2010-01-26 14:03:52 +0000
+++ b/mysql-test/suite/ndb/t/ndb_addnode.cnf 2011-09-06 10:10:36 +0000
@@ -15,6 +15,7 @@ ndb-wait-connected=20
ndb-wait-setup=60
ndb-cluster-connection-pool=3
ndb-extra-logging=99
+ndb-index-stat-enable=0
[cluster_config.ndbd.3.1]
Nodegroup=65536
=== modified file 'mysql-test/suite/ndb/t/ndb_update_no_read.test'
--- a/mysql-test/suite/ndb/t/ndb_update_no_read.test 2010-12-01 12:06:43 +0000
+++ b/mysql-test/suite/ndb/t/ndb_update_no_read.test 2011-09-06 08:37:44 +0000
@@ -436,11 +436,21 @@ let $list =
2207,3553,350,2805,2276,2235,2803,159,1039,2075,576,614,1899,3348,649,218,637,
2942,270,3422,3775,3873,3239,989,2463,783,3312);
+##
+# In ps-protocol, server will adds calls to execute(Commit)
+# (these are optimized away by ndbapi, since there is nothing to commit)
+# and these generates a diff in execute-count
+# To not have to investigate problem futher, I simply set autocommit=off
+# (and back further down where we don't track execute-count any longer)
+# It would probably be good to changes these tests to instead use frazers new
+# ndbapi counters, and instead measure #round-trips
+set autocommit=off;
--echo select count(*) from t1 where a in (...)
--source suite/ndb/include/ndb_init_execute_count.inc
--disable_query_log
eval select count(*) from t1 where a in $list;
--source suite/ndb/include/ndb_execute_count.inc
+set autocommit=on;
--echo update t1 set c = 'kalle' where a in (...)
--source suite/ndb/include/ndb_init_execute_count.inc
=== modified file 'mysql-test/suite/ndb_binlog/my.cnf'
--- a/mysql-test/suite/ndb_binlog/my.cnf 2011-04-15 13:19:59 +0000
+++ b/mysql-test/suite/ndb_binlog/my.cnf 2011-09-06 10:10:36 +0000
@@ -15,6 +15,7 @@ ndb-wait-connected=20
ndb-wait-setup=120
ndb-cluster-connection-pool=3
ndb-extra-logging=99
+ndb-index-stat-enable=0
# Run this suite with binlog-format=ROW by default
binlog-format= row
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf 2011-04-15 09:31:03 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf 2011-09-06 10:10:36 +0000
@@ -18,6 +18,7 @@ ndb-wait-connected=20
ndb-wait-setup=120
ndb-cluster-connection-pool=1
binlog-format=row
+ndb-index-stat-enable=0
[mysqld.1.1]
ndb-log-update-as-write=1
=== modified file 'mysql-test/suite/ndb_rpl/my.cnf'
--- a/mysql-test/suite/ndb_rpl/my.cnf 2011-06-08 19:28:34 +0000
+++ b/mysql-test/suite/ndb_rpl/my.cnf 2011-09-06 10:10:36 +0000
@@ -30,6 +30,7 @@ ndb-log-orig
log-bin= master-bin
# for performance reasons
ndb-table-temporary=1
+ndb-index-stat-enable=0
ndb-extra-logging=99
# Cluster only supports row format
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf 2011-07-06 15:54:35 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf 2011-09-06 10:10:36 +0000
@@ -36,6 +36,7 @@ log-bin= cluster1-
ndb-table-temporary=1
ndb-extra-logging=99
binlog-format=row
+ndb-index-stat-enable=0
[mysqld.1.cluster1]
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf 2011-06-08 19:28:34 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf 2011-09-06 10:10:36 +0000
@@ -33,6 +33,7 @@ loose-innodb_data_file_path= ibdata
slave-net-timeout=120
ndbcluster
ndb-wait-setup=60
+ndb-index-stat-enable=0
[mysqld.1.1]
=== modified file 'mysql-test/suite/ndb_team/my.cnf'
--- a/mysql-test/suite/ndb_team/my.cnf 2011-06-30 08:53:32 +0000
+++ b/mysql-test/suite/ndb_team/my.cnf 2011-09-06 10:10:36 +0000
@@ -15,6 +15,7 @@ ndb-wait-connected=20
ndb-wait-setup=120
ndb-cluster-connection-pool=3
ndb-extra-logging=99
+ndb-index-stat-enable=0
[mysqld.1.1]
=== modified file 'mysql-test/suite/rpl_ndb/my.cnf'
--- a/mysql-test/suite/rpl_ndb/my.cnf 2011-06-08 19:28:34 +0000
+++ b/mysql-test/suite/rpl_ndb/my.cnf 2011-09-06 10:10:36 +0000
@@ -30,6 +30,7 @@ ndb-log-orig
log-bin= master-bin
# for performance reasons
ndb-table-temporary=1
+ndb-index-stat-enable=0
ndb-extra-logging=99
# Cluster only supports row format
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2011-09-02 09:16:56 +0000
+++ b/sql/ha_ndbcluster.cc 2011-09-06 08:37:44 +0000
@@ -742,6 +742,8 @@ static int update_status_variables(Thd_n
if (thd_ndb)
{
ns->execute_count= thd_ndb->m_execute_count;
+ sql_print_information("ns->execute_count => %u",
+ ns->execute_count);
ns->scan_count= thd_ndb->m_scan_count;
ns->pruned_scan_count= thd_ndb->m_pruned_scan_count;
ns->sorted_scan_count= thd_ndb->m_sorted_scan_count;
@@ -1237,6 +1239,8 @@ int execute_no_commit(Thd_ndb *thd_ndb,
const NdbOperation *first= trans->getFirstDefinedOperation();
const NdbOperation *last= trans->getLastDefinedOperation();
thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, thd_ndb->m_execute_count);
thd_ndb->m_unsent_bytes= 0;
DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
if (trans->execute(NdbTransaction::NoCommit,
@@ -1273,6 +1277,8 @@ int execute_commit(THD* thd, Thd_ndb *th
const NdbOperation *first= trans->getFirstDefinedOperation();
const NdbOperation *last= trans->getLastDefinedOperation();
thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, thd_ndb->m_execute_count);
thd_ndb->m_unsent_bytes= 0;
DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
if (trans->execute(NdbTransaction::Commit, ao, force_send))
@@ -1302,6 +1308,8 @@ int execute_no_commit_ie(Thd_ndb *thd_nd
thd_ndb->m_force_send);
thd_ndb->m_unsent_bytes= 0;
thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, thd_ndb->m_execute_count);
DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
DBUG_RETURN(res);
}
@@ -3356,6 +3364,8 @@ int ha_ndbcluster::ndb_pk_update_row(THD
g_ndb_slave_state.atTransactionAbort();
m_thd_ndb->m_unsent_bytes= 0;
m_thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, m_thd_ndb->m_execute_count);
DBUG_PRINT("info", ("execute_count: %u", m_thd_ndb->m_execute_count));
trans->execute(NdbTransaction::Rollback);
#ifdef FIXED_OLD_DATA_TO_ACTUALLY_CONTAIN_GOOD_DATA
@@ -8214,6 +8224,8 @@ static int ndbcluster_rollback(handlerto
g_ndb_slave_state.atTransactionAbort();
thd_ndb->m_unsent_bytes= 0;
thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, thd_ndb->m_execute_count);
DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
if (trans->execute(NdbTransaction::Rollback) != 0)
{
@@ -13433,6 +13445,8 @@ ndb_get_table_statistics(THD *thd, ha_nd
thd_ndb->m_pruned_scan_count += (pOp->getPruned()? 1 : 0);
thd_ndb->m_execute_count++;
+ sql_print_information("%u m_execute_count => %u",
+ __LINE__, thd_ndb->m_execute_count);
DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
if (pTrans->execute(NdbTransaction::NoCommit,
NdbOperation::AbortOnError,
=== modified file 'storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties'
--- a/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties 2011-07-05 12:46:07 +0000
+++ b/storage/ndb/clusterj/clusterj-jdbc/src/main/resources/com/mysql/clusterj/jdbc/Bundle.properties 2011-09-06 10:27:13 +0000
@@ -13,3 +13,4 @@ ERR_LHS_Not_A_Field:Restriction: left ha
ERR_RHS_Not_A_Parameter:Restriction: right hand side of an arithmetic expression must be a parameter.
ERR_Number_Of_Parameters_Not_Initialized: The number of parameters was not initialized.
ERR_Getting_Parameter_Value:Exception getting parameter value for offset {0} index {1}.
+ERR_Parameter_Wrong_Type:The parameter value is the wrong type. Expected {0}; actual {1}.
=== modified file 'storage/ndb/clusterj/pom.xml'
--- a/storage/ndb/clusterj/pom.xml 2011-07-05 22:25:18 +0000
+++ b/storage/ndb/clusterj/pom.xml 2011-09-05 13:55:32 +0000
@@ -51,6 +51,11 @@
maven-surefire-plugin
2.7.2
+
+ org.antlr
+ antlr3-maven-plugin
+ 3.2
+
@@ -71,12 +76,12 @@
org.apache.openjpa
openjpa
- 1.2.0
+ 2.1.0
mysql
mysql-connector-java
- 5.1.15
+ 5.1.17
provided
=== modified file 'storage/ndb/include/kernel/signaldata/TcKeyReq.hpp'
--- a/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp 2011-09-02 09:16:56 +0000
+++ b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp 2011-09-06 10:27:13 +0000
@@ -174,6 +174,8 @@ private:
static Uint8 getAIInTcKeyReq(const UintR & requestInfo);
static UintR getNoDiskFlag(const UintR & requestInfo);
+ static UintR getCoordinatedTransactionFlag(const UintR & requestInfo);
+
/**
* Get:ers for scanInfo
*/
@@ -204,7 +206,7 @@ private:
static void setReorgFlag(UintR & requestInfo, UintR val);
static UintR getReorgFlag(const UintR & requestInfo);
-
+ static void setCoordinatedTransactionFlag(UintR & requestInfo, UintR val);
static void setQueueOnRedoProblemFlag(UintR & requestInfo, UintR val);
static UintR getQueueOnRedoProblemFlag(const UintR & requestInfo);
@@ -243,13 +245,14 @@ private:
y = Commit Type - 2 Bit 12-13
n = No disk flag - 1 Bit 1
r = reorg flag - 1 Bit 19
+ x = Coordinated Tx flag - 1 Bit 16
q = Queue on redo problem - 1 Bit 9
D = deferred constraint - 1 Bit 17
1111111111222222222233
01234567890123456789012345678901
dnb cooop lsyyeiaaarkkkkkkkkkkkk (Short TCKEYREQ)
- dnbvcooopqlsyyei D r (Long TCKEYREQ)
+ dnbvcooopqlsyyeixD r (Long TCKEYREQ)
*/
#define TCKEY_NODISK_SHIFT (1)
@@ -278,6 +281,7 @@ private:
#define TC_REORG_SHIFT (19)
#define QUEUE_ON_REDO_SHIFT (9)
+#define TC_COORDINATED_SHIFT (16)
#define TC_DEFERRED_CONSTAINTS_SHIFT (17)
/**
@@ -376,6 +380,12 @@ TcKeyReq::getDistributionKeyFlag(const U
}
inline
+UintR
+TcKeyReq::getCoordinatedTransactionFlag(const UintR & requestInfo){
+ return (UintR)((requestInfo >> TC_COORDINATED_SHIFT) & 1);
+}
+
+inline
Uint8
TcKeyReq::getViaSPJFlag(const UintR & requestInfo){
return (Uint8)((requestInfo >> VIA_SPJ_SHIFT) & 1);
@@ -476,6 +486,14 @@ TcKeyReq::setDistributionKeyFlag(UintR &
}
inline
+void
+TcKeyReq::setCoordinatedTransactionFlag(UintR & requestInfo, UintR flag){
+ ASSERT_BOOL(flag, "TcKeyReq::setCoordinatedTransactionFlag");
+ requestInfo &= ~(1 << TC_COORDINATED_SHIFT);
+ requestInfo |= (flag << TC_COORDINATED_SHIFT);
+}
+
+inline
void
TcKeyReq::setViaSPJFlag(UintR & requestInfo, Uint32 flag){
ASSERT_BOOL(flag, "TcKeyReq::setViaSPJFlag");
@@ -605,7 +623,7 @@ TcKeyReq::getReorgFlag(const UintR & req
inline
void
TcKeyReq::setReorgFlag(UintR & requestInfo, Uint32 flag){
- ASSERT_BOOL(flag, "TcKeyReq::setNoDiskFlag");
+ ASSERT_BOOL(flag, "TcKeyReq::setReorgFlag");
requestInfo |= (flag << TC_REORG_SHIFT);
}
=== modified file 'storage/ndb/ndb_configure.cmake'
--- a/storage/ndb/ndb_configure.cmake 2011-05-24 08:45:38 +0000
+++ b/storage/ndb/ndb_configure.cmake 2011-09-06 07:46:41 +0000
@@ -201,3 +201,11 @@ ENDIF()
NDB_REQUIRE_VARIABLE(ZLIB_LIBRARY)
NDB_REQUIRE_VARIABLE(ZLIB_INCLUDE_DIR)
+IF(WITH_CLASSPATH)
+ MESSAGE(STATUS "Using supplied classpath: ${WITH_CLASSPATH}")
+ELSE()
+ SET(WITH_CLASSPATH "$ENV{CLASSPATH}")
+ IF(WITH_CLASSPATH)
+ MESSAGE(STATUS "Using CLASSPATH from environment: ${WITH_CLASSPATH}")
+ ENDIF()
+ENDIF()
No bundle (reason: useless for push emails).