Merge bk-internal:/home/bk/mysql-5.1-maint

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

client/mysqltest.c

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

configure.in

@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.14-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.15-beta)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

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

@@ -51,7 +51,7 @@ File_class::size(FILE* f)
   MY_STAT s;
 
   // Note that my_fstat behaves *differently* than my_stat. ARGGGHH!
-  if(my_fstat(::fileno(f), &s, MYF(0)))
+  if (my_fstat(fileno(f), &s, MYF(0)))
     return 0;
 
   return s.st_size;
@@ -140,7 +140,7 @@ File_class::close()
     }   
   }  
   m_file = NULL;
-  
+
   return rc;
 }
 

storage/ndb/tools/ndb_condig.cpp

@@ -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),