mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1 Merge of 'remove compiler warnings when using -Wshadow'
This commit is contained in:
@ -2364,12 +2364,12 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
|
||||
{
|
||||
DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
|
||||
char **ptr= (char**)init_commands->buffer;
|
||||
char **end= ptr + init_commands->elements;
|
||||
char **end_command= ptr + init_commands->elements;
|
||||
|
||||
my_bool reconnect=mysql->reconnect;
|
||||
mysql->reconnect=0;
|
||||
|
||||
for (; ptr<end; ptr++)
|
||||
for (; ptr < end_command; ptr++)
|
||||
{
|
||||
MYSQL_RES *res;
|
||||
if (mysql_real_query(mysql,*ptr, (ulong) strlen(*ptr)))
|
||||
|
Reference in New Issue
Block a user