Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged

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([])

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)

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"
 

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;

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;
 
 #########################################################

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();
+	sysErr->data1= 0;
+	sysErr->data2= __LINE__;
 	sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal, 
 		   SystemError::SignalLength, JBB);
       }

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

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);