summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiguel@hegel.br <>2003-01-04 01:19:17 -0200
committermiguel@hegel.br <>2003-01-04 01:19:17 -0200
commitf50abc4467cda251a46fec8cfd0645f30ad0db6c (patch)
tree222d21000b7c8358ce8b319f4458d6fe2ef1ec5a
parent02810a48be3ea4b1bbc5c4bc993d5aaeb7256896 (diff)
downloadmariadb-git-f50abc4467cda251a46fec8cfd0645f30ad0db6c.tar.gz
Fix warnings and error VC++ compiler
-rw-r--r--client/mysql.cc1
-rw-r--r--sql/sql_test.cc3
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 9ee441a7709..680175f2123 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1414,7 +1414,6 @@ static int com_server_help(String *buffer __attribute__((unused)),
server_cmd= cmd_buf;
}
- char buff[16], time_buf[32];
MYSQL_RES *result;
ulong timer;
uint error= 0;
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 3fbeaa753db..758778ecfa8 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -276,6 +276,7 @@ static void display_table_locks (void)
VOID(pthread_mutex_unlock(&lock->mutex));
}
VOID(pthread_mutex_unlock(&THR_LOCK_lock));
+ uint i;
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);
@@ -283,7 +284,7 @@ static void display_table_locks (void)
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*);
printf("%-8ld%-28.28s%-22s%s\n",