diff options
| -rw-r--r-- | client/mysqltest.c | 19 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | storage/ndb/src/common/util/File.cpp | 4 | ||||
| -rw-r--r-- | storage/ndb/tools/ndb_condig.cpp | 3 |
4 files changed, 4 insertions, 24 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 7193eca36bd..aecb5141e15 100644 --- a/client/mysqltest.c +++ b/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; diff --git a/configure.in b/configure.in index 3555e453ef3..2155676caac 100644 --- a/configure.in +++ b/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 diff --git a/storage/ndb/src/common/util/File.cpp b/storage/ndb/src/common/util/File.cpp index d893260f564..106e6274085 100644 --- a/storage/ndb/src/common/util/File.cpp +++ b/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; } diff --git a/storage/ndb/tools/ndb_condig.cpp b/storage/ndb/tools/ndb_condig.cpp index 049e4599447..c65f7157c15 100644 --- a/storage/ndb/tools/ndb_condig.cpp +++ b/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), |