From 1cdaf36c2a2c2f84985ab901d90eb9b3e942fa64 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 21:26:58 +0100 Subject: [PATCH 1/6] ndb_autodiscover.result, ndb_autodiscover.test: removed this since it easily gives errors if previous tests fail mysql-test/t/ndb_autodiscover.test: removed this since it easily gives errors if previous tests fail mysql-test/r/ndb_autodiscover.result: removed this since it easily gives errors if previous tests fail --- mysql-test/r/ndb_autodiscover.result | 5 ----- mysql-test/t/ndb_autodiscover.test | 1 - 2 files changed, 6 deletions(-) diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result index b9e70b9c1cf..b89b4ce1f21 100644 --- a/mysql-test/r/ndb_autodiscover.result +++ b/mysql-test/r/ndb_autodiscover.result @@ -353,11 +353,6 @@ drop table t1; use test2; drop table t2; drop database test2; -show databases; -Database -information_schema -mysql -test use test; drop database if exists test_only_ndb_tables; create database test_only_ndb_tables; diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test index e6bfedc89ed..2159e6b6e62 100644 --- a/mysql-test/t/ndb_autodiscover.test +++ b/mysql-test/t/ndb_autodiscover.test @@ -449,7 +449,6 @@ drop table t1; use test2; drop table t2; drop database test2; -show databases; use test; ######################################################### From d69fcc2e05a048a7b268ac62c08f6538a57986f8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 22:28:08 +0100 Subject: [PATCH 2/6] ha_ndbcluster.cc: read row size with wrong type sql/ha_ndbcluster.cc: read row size with wrong type --- sql/ha_ndbcluster.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index bbed637e5b1..5cca81b1200 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4901,7 +4901,8 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, if (check == -1) break; - Uint64 rows, commits, size, mem; + Uint64 rows, commits, mem; + Uint32 size; pOp->getValue(NdbDictionary::Column::ROW_COUNT, (char*)&rows); pOp->getValue(NdbDictionary::Column::COMMIT_COUNT, (char*)&commits); pOp->getValue(NdbDictionary::Column::ROW_SIZE, (char*)&size); From 43abffc89b83099d4ab701be5a002f0c3dc4e56f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Jan 2005 23:23:15 +0100 Subject: [PATCH 3/6] --- sql/ha_federated.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index abd33f2eaef..ea8633febe6 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -973,6 +973,7 @@ inline uint field_in_record_is_null ( int ha_federated::write_row(byte * buf) { int x= 0, num_fields= 0; + Field **field; ulong current_query_id= 1; ulong tmp_query_id; int all_fields_have_same_query_id= 1; @@ -1021,7 +1022,7 @@ int ha_federated::write_row(byte * buf) 0 if it remains 0, then that means no fields were specified in the query such as in the case of INSERT INTO table VALUES (val1, val2, valN) */ - for (Field **field= table->field; *field ; field++, x++) + for (field= table->field; *field ; field++, x++) { if (x > 0 && tmp_query_id != (*field)->query_id) all_fields_have_same_query_id= 0; @@ -1032,7 +1033,7 @@ int ha_federated::write_row(byte * buf) loop through the field pointer array, add any fields to both the values list and the fields list that match the current query id */ - for (Field **field= table->field; *field ; field++, x++) + for (field= table->field; *field ; field++, x++) { DBUG_PRINT("ha_federated::write_row", ("field type %d", (*field)->type())); // if there is a query id and if it's equal to the current query id From 7a3767fc5ebdf376280f4d0ecaa52e9e3aef9bf4 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Jan 2005 07:53:02 +0100 Subject: [PATCH 4/6] Bug#8051 - ndb Make sure to ship error code in system error signal --- ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index a8ad4008a74..d6315ab259e 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -2976,6 +2976,8 @@ void Dbdih::execCOPY_FRAGREF(Signal* signal) SystemError * const sysErr = (SystemError*)&signal->theData[0]; sysErr->errorCode = SystemError::CopyFragRefError; sysErr->errorRef = reference(); + sysErr->data1 = errorCode; + sysErr->data2 = 0; sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, SystemError::SignalLength, JBB); return; @@ -4492,6 +4494,8 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI) SystemError * const sysErr = (SystemError*)&signal->theData[0]; sysErr->errorCode = SystemError::CopyFragRefError; sysErr->errorRef = reference(); + signal->data1= 0; + signal->data2= __LINE__; sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, SystemError::SignalLength, JBB); } From 4bfad5aedb45d386a4449f70cf079357c297642c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Jan 2005 08:28:23 +0100 Subject: [PATCH 5/6] bug#8051 - ndb, typo, more info on crash ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: typo --- ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index d6315ab259e..dba1efbba9a 100644 --- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -4494,8 +4494,8 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI) SystemError * const sysErr = (SystemError*)&signal->theData[0]; sysErr->errorCode = SystemError::CopyFragRefError; sysErr->errorRef = reference(); - signal->data1= 0; - signal->data2= __LINE__; + sysErr->data1= 0; + sysErr->data2= __LINE__; sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, SystemError::SignalLength, JBB); } From 4c0a0c3e56fa94baff9f12895c6d96f1ffb77698 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Jan 2005 08:41:38 +0100 Subject: [PATCH 6/6] moved START_AND_EXIT check so it can actually be used fix as not to overwrite previoulsy set flags in configure config/ac-macros/ha_ndbcluster.m4: fix as not to overwrite previoulsy set flags in configure configure.in: fix as not to overwrite previoulsy set flags in configure mysql-test/mysql-test-run.sh: movet START_AND_EXIT check so it can actually be used --- config/ac-macros/ha_ndbcluster.m4 | 4 ++-- configure.in | 1 + mysql-test/mysql-test-run.sh | 10 ++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 751a11d1895..dc5e0e73558 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -64,8 +64,8 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ AC_ARG_WITH([ndb-ccflags], [ --with-ndb-ccflags Extra CC options for ndb compile], - [ndb_cxxflags_fix=$withval], - [ndb_cxxflags_fix=]) + [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"], + [ndb_cxxflags_fix=$ndb_cxxflags_fix]) AC_MSG_CHECKING([for NDB Cluster options]) AC_MSG_RESULT([]) diff --git a/configure.in b/configure.in index e20edf97a72..3a0a2aa9c9d 100644 --- a/configure.in +++ b/configure.in @@ -962,6 +962,7 @@ esac MAX_C_OPTIMIZE="-O3" MAX_CXX_OPTIMIZE="-O3" +ndb_cxxflags_fix= case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in # workaround for Sun Forte/x86 see BUG#4681 *solaris*-i?86-no) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a6cbea2d1e5..037fdb28199 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1547,6 +1547,12 @@ run_testcase () fi fi fi + + if [ "x$START_AND_EXIT" = "x1" ] ; then + echo "Servers started, exiting" + exit + fi + cd $MYSQL_TEST_DIR if [ -f $tf ] ; then @@ -1682,10 +1688,6 @@ then mysql_loadstd fi -if [ "x$START_AND_EXIT" = "x1" ] ; then - echo "Servers started, exiting" - exit -fi $ECHO "Starting Tests"