database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/my/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
This commit is contained in:
monty@narttu.mysql.fi
2007-01-27 03:46:45 +02:00
parent c022454e7c 120e3f5ee1
commit 8a80e36ac3
215 changed files with 3302 additions and 3092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
strings/ctype-simple.c
View File

@ -1173,7 +1173,7 @@ uint my_instr_simple(CHARSET_INFO *cs,
{
match->beg= 0;
match->end= 0;
match->mblen= 0;
match->mb_len= 0;
}
return 1; /* Empty string is always found */
}
@ -1201,13 +1201,13 @@ skip:
{
match[0].beg= 0;
match[0].end= (uint) (str- (const uchar*)b-1);
match[0].mblen= match[0].end;
match[0].mb_len= match[0].end;
if (nmatch > 1)
{
match[1].beg= match[0].end;
match[1].end= match[0].end+s_length;
match[1].mblen= match[1].end-match[1].beg;
match[1].mb_len= match[1].end-match[1].beg;
}
}
return 2;
@ -1598,19 +1598,19 @@ exp: /* [ E [ <sign> ] <unsigned integer> ] */
str++;
if (str < end)
{
int negative_exp, exp;
int negative_exp, exponent;
if ((negative_exp= (*str == '-')) || *str=='+')
{
if (++str == end)
goto ret_sign;
}
for (exp= 0 ;
for (exponent= 0 ;
str < end && (ch= (unsigned char) (*str - '0')) < 10;
str++)
{
exp= exp * 10 + ch;
exponent= exponent * 10 + ch;
}
shift+= negative_exp ? -exp : exp;
shift+= negative_exp ? -exponent : exponent;
}
}