database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remove unused variables and label

Browse Source
This commit is contained in:
msvensson@shellback.
2006-04-10 18:34:18 +02:00
parent daae1668de
commit 765024d829
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/lib_sql.cc
View File

@ -274,7 +274,6 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
{ {
DBUG_ENTER("emb_stmt_execute"); DBUG_ENTER("emb_stmt_execute");
char header[5]; char header[5];
MYSQL_DATA *res;
THD *thd; THD *thd;
int4store(header, stmt->stmt_id); int4store(header, stmt->stmt_id);
@ -1033,7 +1032,6 @@ void Protocol_simple::prepare_for_resend()
data->embedded_info->prev_ptr= &cur->next; data->embedded_info->prev_ptr= &cur->next;
next_field=cur->data; next_field=cur->data;
next_mysql_field= data->embedded_info->fields_list; next_mysql_field= data->embedded_info->fields_list;
err:
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

2
server-tools/instance-manager/guardian.cc
View File

@ -201,8 +201,6 @@ void Guardian_thread::run()
while (node != NULL) while (node != NULL)
{ {
struct timespec timeout;
GUARD_NODE *current_node= (GUARD_NODE *) node->data; GUARD_NODE *current_node= (GUARD_NODE *) node->data;
instance= ((GUARD_NODE *) node->data)->instance; instance= ((GUARD_NODE *) node->data)->instance;
process_instance(instance, current_node, &guarded_instances, node); process_instance(instance, current_node, &guarded_instances, node);

2
server-tools/instance-manager/mysql_connection.cc
View File

@ -136,7 +136,7 @@ int Mysql_connection_thread::init()
/* Initialize random number generator */ /* Initialize random number generator */
{ {
ulong seed1= (ulong) &rand_st + rand(); ulong seed1= (ulong) &rand_st + rand();
ulong seed2= rand() + time(0); ulong seed2= (ulong) rand() + time(0);
randominit(&rand_st, seed1, seed2); randominit(&rand_st, seed1, seed2);
} }
/* Fill scramble - server's random message used for handshake */ /* Fill scramble - server's random message used for handshake */

4
sql/ha_partition.cc
View File

@ -1135,7 +1135,6 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
partition_element *part_elem= part_it++; partition_element *part_elem= part_it++;
if (all_parts || part_elem->part_state == PART_CHANGED) if (all_parts || part_elem->part_state == PART_CHANGED)
{ {
handler *file;
if (m_is_sub_partitioned) if (m_is_sub_partitioned)
{ {
List_iterator<partition_element> sub_it(part_elem->subpartitions); 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: err_handler:
while (file-- != m_file) while (file-- != m_file)
(*file)->close(); (*file)->close();
err:
DBUG_RETURN(error); DBUG_RETURN(error);
} }
@ -2915,7 +2914,6 @@ int ha_partition::rnd_init(bool scan)
int error; int error;
uint i= 0; uint i= 0;
uint32 part_id; uint32 part_id;
handler **file;
DBUG_ENTER("ha_partition::rnd_init"); DBUG_ENTER("ha_partition::rnd_init");
include_partition_fields_in_used_fields(); include_partition_fields_in_used_fields();