mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
relying on loop counter variables being local to the loop body if
declared in the 'for' statement is not portable, some compilers still don't implement this ANSI C++ specification (Bug #14995)
This commit is contained in:
@ -88,7 +88,7 @@ Listener_thread::~Listener_thread()
|
|||||||
|
|
||||||
void Listener_thread::run()
|
void Listener_thread::run()
|
||||||
{
|
{
|
||||||
int n= 0;
|
int i, n= 0;
|
||||||
|
|
||||||
#ifndef __WIN__
|
#ifndef __WIN__
|
||||||
/* we use this var to check whether we are running on LinuxThreads */
|
/* we use this var to check whether we are running on LinuxThreads */
|
||||||
@ -117,7 +117,7 @@ void Listener_thread::run()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* II. Listen sockets and spawn childs */
|
/* II. Listen sockets and spawn childs */
|
||||||
for (int i= 0; i < num_sockets; i++)
|
for (i= 0; i < num_sockets; i++)
|
||||||
n= max(n, sockets[i]);
|
n= max(n, sockets[i]);
|
||||||
n++;
|
n++;
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ void Listener_thread::run()
|
|||||||
|
|
||||||
log_info("Listener_thread::run(): shutdown requested, exiting...");
|
log_info("Listener_thread::run(): shutdown requested, exiting...");
|
||||||
|
|
||||||
for (int i= 0; i < num_sockets; i++)
|
for (i= 0; i < num_sockets; i++)
|
||||||
close(sockets[i]);
|
close(sockets[i]);
|
||||||
|
|
||||||
#ifndef __WIN__
|
#ifndef __WIN__
|
||||||
@ -189,7 +189,7 @@ void Listener_thread::run()
|
|||||||
|
|
||||||
err:
|
err:
|
||||||
// we have to close the ip sockets in case of error
|
// we have to close the ip sockets in case of error
|
||||||
for (int i= 0; i < num_sockets; i++)
|
for (i= 0; i < num_sockets; i++)
|
||||||
close(sockets[i]);
|
close(sockets[i]);
|
||||||
|
|
||||||
thread_registry.unregister_thread(&thread_info);
|
thread_registry.unregister_thread(&thread_info);
|
||||||
|
Reference in New Issue
Block a user