mirror of
https://github.com/MariaDB/server.git
synced 2025-06-13 13:01:51 +03:00
Fix warnings and error VC++ compiler
This commit is contained in:
@ -1414,7 +1414,6 @@ static int com_server_help(String *buffer __attribute__((unused)),
|
|||||||
server_cmd= cmd_buf;
|
server_cmd= cmd_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
char buff[16], time_buf[32];
|
|
||||||
MYSQL_RES *result;
|
MYSQL_RES *result;
|
||||||
ulong timer;
|
ulong timer;
|
||||||
uint error= 0;
|
uint error= 0;
|
||||||
|
@ -276,6 +276,7 @@ static void display_table_locks (void)
|
|||||||
VOID(pthread_mutex_unlock(&lock->mutex));
|
VOID(pthread_mutex_unlock(&lock->mutex));
|
||||||
}
|
}
|
||||||
VOID(pthread_mutex_unlock(&THR_LOCK_lock));
|
VOID(pthread_mutex_unlock(&THR_LOCK_lock));
|
||||||
|
uint i;
|
||||||
if (!saved_table_locks.elements) goto end;
|
if (!saved_table_locks.elements) goto end;
|
||||||
|
|
||||||
qsort((gptr) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare);
|
qsort((gptr) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare);
|
||||||
@ -283,7 +284,7 @@ static void display_table_locks (void)
|
|||||||
|
|
||||||
puts("\nThread database.table_name Locked/Waiting Lock_type\n");
|
puts("\nThread database.table_name Locked/Waiting Lock_type\n");
|
||||||
|
|
||||||
for (uint i=0 ; i < saved_table_locks.elements ; i++)
|
for (i=0 ; i < saved_table_locks.elements ; i++)
|
||||||
{
|
{
|
||||||
TABLE_LOCK_INFO *dl_ptr=dynamic_element(&saved_table_locks,i,TABLE_LOCK_INFO*);
|
TABLE_LOCK_INFO *dl_ptr=dynamic_element(&saved_table_locks,i,TABLE_LOCK_INFO*);
|
||||||
printf("%-8ld%-28.28s%-22s%s\n",
|
printf("%-8ld%-28.28s%-22s%s\n",
|
||||||
|
Reference in New Issue
Block a user