All warnings removed.
Minimal changes to remove warnings when compiling.
This commit is contained in:
@ -1670,7 +1670,7 @@ int main(int argc, char **argv)
|
|||||||
if(!daemon_mode)
|
if(!daemon_mode)
|
||||||
{
|
{
|
||||||
strncat(errorbuffer, "\n", STRING_BUFFER_SIZE);
|
strncat(errorbuffer, "\n", STRING_BUFFER_SIZE);
|
||||||
fprintf(stderr, errorbuffer);
|
fprintf(stderr, "%s", errorbuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = MAXSCALE_BADCONFIG;
|
rc = MAXSCALE_BADCONFIG;
|
||||||
|
@ -67,7 +67,7 @@ int
|
|||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
MEMLOG *log, *log2;
|
MEMLOG *log, *log2;
|
||||||
int i;
|
long int i;
|
||||||
long j;
|
long j;
|
||||||
long long k;
|
long long k;
|
||||||
int failures = 0;
|
int failures = 0;
|
||||||
|
@ -151,11 +151,14 @@ test3_helper(void *data)
|
|||||||
// SPINLOCK *lck = (SPINLOCK *)data;
|
// SPINLOCK *lck = (SPINLOCK *)data;
|
||||||
int i;
|
int i;
|
||||||
int n = *(int *)data;
|
int n = *(int *)data;
|
||||||
struct timespec sleeptime;
|
|
||||||
time_t rawtime;
|
time_t rawtime;
|
||||||
|
|
||||||
|
#if defined(ADD_SOME_NANOSLEEP)
|
||||||
|
struct timespec sleeptime;
|
||||||
|
|
||||||
sleeptime.tv_sec = 0;
|
sleeptime.tv_sec = 0;
|
||||||
sleeptime.tv_nsec = 1;
|
sleeptime.tv_nsec = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
if (spinlock_acquire_nowait(&lck)) {
|
if (spinlock_acquire_nowait(&lck)) {
|
||||||
@ -185,7 +188,9 @@ time_t rawtime;
|
|||||||
active = 0;
|
active = 0;
|
||||||
spinlock_release(&lck);
|
spinlock_release(&lck);
|
||||||
for (i=0; i<(4*PROCESS_LOOP); i++);
|
for (i=0; i<(4*PROCESS_LOOP); i++);
|
||||||
// nanosleep(&sleeptime, NULL);
|
#if defined(ADD_SOME_NANOSLEEP)
|
||||||
|
nanosleep(&sleeptime, NULL);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
spinlock_release(&lck);
|
spinlock_release(&lck);
|
||||||
}
|
}
|
||||||
@ -199,11 +204,6 @@ int i;
|
|||||||
int tnum[THREADS];
|
int tnum[THREADS];
|
||||||
time_t rawtime;
|
time_t rawtime;
|
||||||
|
|
||||||
struct timespec sleeptime;
|
|
||||||
|
|
||||||
sleeptime.tv_sec = 20;
|
|
||||||
sleeptime.tv_nsec = NANOTIME;
|
|
||||||
|
|
||||||
times_run = 0;
|
times_run = 0;
|
||||||
active = 0;
|
active = 0;
|
||||||
failures = 0;
|
failures = 0;
|
||||||
|
@ -2261,7 +2261,7 @@ char *create_auth_fail_str(
|
|||||||
}
|
}
|
||||||
else if(errcode == MYSQL_FAILED_AUTH_SSL)
|
else if(errcode == MYSQL_FAILED_AUTH_SSL)
|
||||||
{
|
{
|
||||||
sprintf(errstr, ferrstr);
|
sprintf(errstr, "%s", ferrstr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user