mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-12-05 19:19:58 +01:00
commit 90226bbc33
4 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client/mysqltest.c
View file

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

3
mysql-test/mysql-test-run.pl
View file

@ -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");
}

2
storage/ndb/src/common/util/File.cpp
View file

@ -140,7 +140,7 @@ File_class::close()
}
}
m_file = NULL;
return rc;
}

3
storage/ndb/tools/ndb_condig.cpp
View file

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