database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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

6
strings/ctype-bin.c
View File

@ -415,7 +415,7 @@ uint my_instr_bin(CHARSET_INFO *cs __attribute__((unused)),
{
match->beg= 0;
match->end= 0;
match->mblen= 0;
match->mb_len= 0;
}
return 1; /* Empty string is always found */
}
@ -443,13 +443,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;