Commit 477f1e2f authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents b85705cc a2037c67

mysql-test/r/ndb_subquery.result

+19 −0
Original line number Diff line number Diff line
@@ -40,3 +40,22 @@ p u o 
5	5	5

drop table t1;

drop table t2;

create table t1 (p int not null primary key, u int not null) engine=ndb;

insert into t1 values (1,1),(2,2),(3,3);

create table t2 as 

select t1.*

from t1 as t1, t1 as t2, t1 as t3, t1 as t4, t1 as t5, t1 as t6, t1 as t7, t1 as t8

where t1.u = t2.u

and t2.u = t3.u

and t3.u = t4.u

and t4.u = t5.u

and t5.u = t6.u

and t6.u = t7.u

and t7.u = t8.u;

select * from t2 order by 1;

p	u

1	1

2	2

3	3

drop table t1;

drop table t2;

mysql-test/t/ndb_subquery.test

+23 −0
Original line number Diff line number Diff line
@@ -37,3 +37,26 @@ drop table t1; 
drop table t2;

# bug#5367

##########



###

# bug#11205

create table t1 (p int not null primary key, u int not null) engine=ndb;

insert into t1 values (1,1),(2,2),(3,3);



create table t2 as 

select t1.*

from t1 as t1, t1 as t2, t1 as t3, t1 as t4, t1 as t5, t1 as t6, t1 as t7, t1 as t8

where t1.u = t2.u

  and t2.u = t3.u

  and t3.u = t4.u

  and t4.u = t5.u

  and t5.u = t6.u

  and t6.u = t7.u

  and t7.u = t8.u;



select * from t2 order by 1;



drop table t1;

drop table t2;

ndb/include/ndbapi/Ndb.hpp

+1 −1
Original line number Diff line number Diff line
@@ -1614,7 +1614,7 @@ private: 
  Uint32                theNoOfPreparedTransactions;

  Uint32                theNoOfSentTransactions;

  Uint32                theNoOfCompletedTransactions;

  Uint32                theNoOfAllocatedTransactions;

  Uint32                theRemainingStartTransactions;

  Uint32                theMaxNoOfTransactions;

  Uint32                theMinNoOfEventsToWakeUp;

ndb/src/common/logger/Logger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -352,11 +352,11 @@ Logger::log(LoggerLevel logLevel, const char* pMsg, va_list ap) const 
{

  if (m_logLevels[LL_ON] && m_logLevels[logLevel])

  {

    char buf[MAX_LOG_MESSAGE_SIZE];

    BaseString::vsnprintf(buf, sizeof(buf), pMsg, ap);

    LogHandler* pHandler = NULL;

    while ( (pHandler = m_pHandlerList->next()) != NULL)

    {

      char buf[MAX_LOG_MESSAGE_SIZE];

      BaseString::vsnprintf(buf, sizeof(buf), pMsg, ap);

      pHandler->append(m_pCategory, logLevel, buf);

    }

  }

ndb/src/cw/cpcd/main.cpp

+3 −6
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ 
#include "common.hpp"



static const char *work_dir = CPCD_DEFAULT_WORK_DIR;

static short unsigned int port;

static int unsigned port;

static int use_syslog;

static const char *logfile = NULL;

static const char *config_file = CPCD_DEFAULT_CONFIG_FILE;

static const char *user = 0;



static struct my_option my_long_options[] =
@@ -55,9 +54,6 @@ static struct my_option my_long_options[] = 
  { "debug", 'D', "Enable debug mode",

    (gptr*) &debug, (gptr*) &debug, 0,

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

  { "config", 'c', "Config file",

    (gptr*) &config_file, (gptr*) &config_file, 0,

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

  { "user", 'u', "Run as user",

    (gptr*) &user, (gptr*) &user, 0,

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
@@ -142,7 +138,8 @@ int main(int argc, char** argv){ 
  

  SocketServer * ss = new SocketServer();

  CPCDAPIService * serv = new CPCDAPIService(cpcd);

  if(!ss->setup(serv, &port)){

  unsigned short real_port= port; // correct type

  if(!ss->setup(serv, &real_port)){

    logger.critical("Cannot setup server: %s", strerror(errno));

    sleep(1);

    delete ss;