Commit 7b2aacb7 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/tools/Makefile.am:
  merge
ndb/tools/restore/restore_main.cpp:
  merge
parents b48e721d c9415fd4

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -558,3 +558,12 @@ DROP TABLE t1,t2; 
select * from (select group_concat('c') from DUAL) t;

group_concat('c')

NULL

create table t1 ( a int not null default 0);

select * from (select group_concat(a) from t1) t2;

group_concat(a)

NULL

select group_concat('x') UNION ALL select 1;

group_concat('x')

NULL

1

drop table t1;

mysql-test/t/func_gconcat.test

+8 −0
Original line number Diff line number Diff line
@@ -355,4 +355,12 @@ DROP TABLE t1,t2; 
#

select * from (select group_concat('c') from DUAL) t;



#

# Bug #12859 group_concat in subquery cause incorrect not null

#

create table t1 ( a int not null default 0);

select * from (select group_concat(a) from t1) t2;

select group_concat('x') UNION ALL select 1;

drop table t1;



# End of 4.1 tests

ndb/include/util/ndb_opts.h

+11 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ my_bool opt_ndb_optimized_node_selection 
int opt_ndb_nodeid;

bool opt_endinfo= 0;

my_bool opt_ndb_shm;

my_bool opt_core;

const char *opt_ndb_connectstring= 0;

const char *opt_connect_str= 0;

const char *opt_ndb_mgmd= 0;
@@ -41,6 +42,11 @@ const char *opt_debug= 0; 
#endif



#define OPT_NDB_CONNECTSTRING 'c'

#if defined VM_TRACE && ( ! ( defined NDB_OSE || defined NDB_SOFTOSE) )

#define OPT_WANT_CORE_DEFAULT 1

#else

#define OPT_WANT_CORE_DEFAULT 0

#endif



#define NDB_STD_OPTS_COMMON \

  { "usage", '?', "Display this help and exit.", \
@@ -75,7 +81,10 @@ const char *opt_debug= 0; 
    GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},\

  { "connect-string", OPT_NDB_CONNECTSTRING, "same as --ndb-connectstring",\

    (gptr*) &opt_ndb_connectstring, (gptr*) &opt_ndb_connectstring, \

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }

    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "core-file", OPT_WANT_CORE, "Write core on errors.",\

    (gptr*) &opt_core, (gptr*) &opt_core, 0,\

    GET_BOOL, NO_ARG, OPT_WANT_CORE_DEFAULT, 0, 0, 0, 0, 0}



#ifndef DBUG_OFF

#define NDB_STD_OPTS(prog_name) \
@@ -99,6 +108,7 @@ enum ndb_std_options { 
  OPT_NDB_SHM= 256,

  OPT_NDB_SHM_SIGNUM,

  OPT_NDB_OPTIMIZED_NODE_SELECTION,

  OPT_WANT_CORE,

  OPT_NDB_MGMD,

  OPT_NDB_NODEID,

  NDB_STD_OPTIONS_LAST /* should always be last in this enum */

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,14 @@ void Ndbcntr::Missra::sendNextSTTOR(Signal* signal){ 
    

    const Uint32 start = currentBlockIndex;

    

    if (currentStartPhase == ZSTART_PHASE_6)

    {

      // Ndbd has passed the critical startphases.

      // Change error handler from "startup" state

      // to normal state.

      ErrorReporter::setErrorHandlerShutdownType();

    }



    for(; currentBlockIndex < ALL_BLOCKS_SZ; currentBlockIndex++){

      jam();

      if(ALL_BLOCKS[currentBlockIndex].NextSP == currentStartPhase){

ndb/src/kernel/error/ErrorReporter.cpp

+12 −2
Original line number Diff line number Diff line
@@ -152,6 +152,14 @@ ErrorReporter::formatMessage(ErrorCategory type, 
  return;

}



NdbShutdownType ErrorReporter::s_errorHandlerShutdownType = NST_ErrorHandler;



void

ErrorReporter::setErrorHandlerShutdownType(NdbShutdownType nst)

{

  s_errorHandlerShutdownType = nst;

}



void

ErrorReporter::handleAssert(const char* message, const char* file, int line)

{
@@ -170,7 +178,7 @@ ErrorReporter::handleAssert(const char* message, const char* file, int line) 
  WriteMessage(assert, ERR_ERROR_PRGERR, message, refMessage,

	       theEmulatedJamIndex, theEmulatedJam);



  NdbShutdown(NST_ErrorHandler);

  NdbShutdown(s_errorHandlerShutdownType);

}



void
@@ -182,7 +190,7 @@ ErrorReporter::handleThreadAssert(const char* message, 
  BaseString::snprintf(refMessage, 100, "file: %s lineNo: %d - %s",

	   file, line, message);

  

  NdbShutdown(NST_ErrorHandler);

  NdbShutdown(s_errorHandlerShutdownType);

}//ErrorReporter::handleThreadAssert()
@@ -201,6 +209,8 @@ ErrorReporter::handleError(ErrorCategory type, int messageID, 
  if(messageID == ERR_ERROR_INSERT){

    NdbShutdown(NST_ErrorInsert);

  } else {

    if (nst == NST_ErrorHandler)

      nst = s_errorHandlerShutdownType;

    NdbShutdown(nst);

  }

}