diff options
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 2 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 70022d526a5..9e763df8a0a 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -274,7 +274,6 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) { DBUG_ENTER("emb_stmt_execute"); char header[5]; - MYSQL_DATA *res; THD *thd; int4store(header, stmt->stmt_id); @@ -1033,7 +1032,6 @@ void Protocol_simple::prepare_for_resend() data->embedded_info->prev_ptr= &cur->next; next_field=cur->data; next_mysql_field= data->embedded_info->fields_list; -err: DBUG_VOID_RETURN; } diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 7a532263846..3be672cd71c 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -201,8 +201,6 @@ void Guardian_thread::run() while (node != NULL) { - struct timespec timeout; - GUARD_NODE *current_node= (GUARD_NODE *) node->data; instance= ((GUARD_NODE *) node->data)->instance; process_instance(instance, current_node, &guarded_instances, node); diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index bf39c843f0a..dcd1807701f 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -136,7 +136,7 @@ int Mysql_connection_thread::init() /* Initialize random number generator */ { ulong seed1= (ulong) &rand_st + rand(); - ulong seed2= rand() + time(0); + ulong seed2= (ulong) rand() + time(0); randominit(&rand_st, seed1, seed2); } /* Fill scramble - server's random message used for handshake */ diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7cf841a5d71..2254fb5583a 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1135,7 +1135,6 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt, partition_element *part_elem= part_it++; if (all_parts || part_elem->part_state == PART_CHANGED) { - handler *file; if (m_is_sub_partitioned) { List_iterator<partition_element> sub_it(part_elem->subpartitions); @@ -2311,7 +2310,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked) err_handler: while (file-- != m_file) (*file)->close(); -err: + DBUG_RETURN(error); } @@ -2915,7 +2914,6 @@ int ha_partition::rnd_init(bool scan) int error; uint i= 0; uint32 part_id; - handler **file; DBUG_ENTER("ha_partition::rnd_init"); include_partition_fields_in_used_fields(); |