Commit 77259bc7 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/item_func.cc:
  Auto merged
parents bfee156a 7f113e91

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.