Commit 298cb454 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

ix compilition for computer in a previous timezone

parent ef97deb0
...@@ -111,6 +111,8 @@ safe_cd($ver); ...@@ -111,6 +111,8 @@ safe_cd($ver);
if ($opt_stage <= 1) if ($opt_stage <= 1)
{ {
$opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory);
# Fix files if this is in another timezone than work.mysql.com
log_system("touch *");
unlink("config.cache"); unlink("config.cache");
log_system("$make clean") if ($opt_use_old_distribution); log_system("$make clean") if ($opt_use_old_distribution);
if ($opt_static_server) if ($opt_static_server)
......
...@@ -177,7 +177,7 @@ static my_bool net_realloc(NET *net, ulong length) ...@@ -177,7 +177,7 @@ static my_bool net_realloc(NET *net, ulong length)
void net_clear(NET *net) void net_clear(NET *net)
{ {
#ifndef EXTRA_DEBUG #ifndef EXTRA_DEBUG
int count; int count; // One may get 'unused' warning
bool is_blocking=vio_is_blocking(net->vio); bool is_blocking=vio_is_blocking(net->vio);
if (is_blocking) if (is_blocking)
vio_blocking(net->vio, FALSE); vio_blocking(net->vio, FALSE);
......
...@@ -174,7 +174,6 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, ...@@ -174,7 +174,6 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
*/ */
static HASH hash_user_connections; static HASH hash_user_connections;
static DYNAMIC_ARRAY user_conn_array;
extern pthread_mutex_t LOCK_user_conn; extern pthread_mutex_t LOCK_user_conn;
struct user_conn { struct user_conn {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment