Commit 64f5ce7e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Manual merge
storage/ndb/src/common/util/InputStream.cpp:
  Manual merge
parents 439e4aff 429cf988

client/mysqltest.c

+0 −19
Original line number Diff line number Diff line
@@ -725,20 +725,6 @@ void close_connections() 
}





void close_statements()

{

  struct st_connection *con;

  DBUG_ENTER("close_statements");

  for (con= connections; con < next_con; con++)

  {

    if (con->stmt)

      mysql_stmt_close(con->stmt);

    con->stmt= 0;

  }

  DBUG_VOID_RETURN;

}





void close_files()

{

  DBUG_ENTER("close_files");
@@ -2915,10 +2901,6 @@ void do_close_connection(struct st_command *command) 
	}

      }

#endif

      if (next_con->stmt)

        mysql_stmt_close(next_con->stmt);

      next_con->stmt= 0;



      mysql_close(&con->mysql);

      if (con->util_mysql)

	mysql_close(con->util_mysql);
@@ -5912,7 +5894,6 @@ int main(int argc, char **argv) 
	break;

      case Q_DISABLE_PS_PROTOCOL:

        ps_protocol_enabled= 0;

        close_statements();

        break;

      case Q_ENABLE_PS_PROTOCOL:

        ps_protocol_enabled= ps_protocol;

mysql-test/mysql-test-run.pl

+0 −3
Original line number Diff line number Diff line
@@ -792,9 +792,6 @@ sub command_line_setup () { 
    {

      # Only platforms that have native symlinks can use the vardir trick

      $opt_mem= $opt_vardir;

      # Delete the default directory in case it exists since we're going to create

      # a new one later anyway, and the mkpath below throws a fatal error otherwise

      eval { rmtree($default_vardir, 1, 1); };

      mtr_report("Using 4.1 vardir trick");

    }

storage/ndb/tools/ndb_condig.cpp

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static int g_verbose = 0; 
static int try_reconnect = 3;



static int g_nodes, g_connections, g_section;

static const char * g_connectstring = 0;

static const char * g_query = 0;



static int g_nodeid = 0;
@@ -486,7 +485,7 @@ fetch_configuration() 


  ndb_mgm_set_error_stream(mgm, stderr);

  

  if (ndb_mgm_set_connectstring(mgm, g_connectstring))

  if (ndb_mgm_set_connectstring(mgm, opt_connect_str))

  {

    fprintf(stderr, "* %5d: %s\n", 

	    ndb_mgm_get_latest_error(mgm),

storage/ndb/src/common/util/File.cpp

+1 −1

File changed.

Contains only whitespace changes.