summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild-tools/Do-compile2
-rw-r--r--sql/net_serv.cc2
-rw-r--r--sql/sql_parse.cc1
3 files changed, 3 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 6f9854a0792..0bea693a441 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -111,6 +111,8 @@ safe_cd($ver);
if ($opt_stage <= 1)
{
$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");
log_system("$make clean") if ($opt_use_old_distribution);
if ($opt_static_server)
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index ba0944a2516..c9bfd977e78 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -177,7 +177,7 @@ static my_bool net_realloc(NET *net, ulong length)
void net_clear(NET *net)
{
#ifndef EXTRA_DEBUG
- int count;
+ int count; // One may get 'unused' warning
bool is_blocking=vio_is_blocking(net->vio);
if (is_blocking)
vio_blocking(net->vio, FALSE);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 99fc0fc8fbf..816825c8cc1 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -174,7 +174,6 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
*/
static HASH hash_user_connections;
-static DYNAMIC_ARRAY user_conn_array;
extern pthread_mutex_t LOCK_user_conn;
struct user_conn {