mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
3e32ba3ff1
Add some extra error output and code cleanup in an attempt to fix/debug a rare random testsuite problem in check_warnings, where the exit code from mysqltest is somehow corrupted inside mysql-test-run.pl. include/my_global.h: Fix compiler warnings on some platforms. mysql-test/lib/My/SafeProcess.pm: Move dereference of $? subprocess exit code closer to where it is generated, to make the code more robust and on the chance that this will fix the occasional problems in check_warnings we see in Buildbot. mysql-test/mysql-test-run.pl: When check_warnings failed, also log the mysqld server for which it failed. sql/sql_lex.cc: Fix compiler warning about possibly uninitialised value, by rewriting a for() loop that is always executed at least once into a do .. while() loop with an assert. sql/table.cc: Fix compiler warning about uninitialised value. storage/federatedx/ha_federatedx.cc: Fix uninitialised variable. storage/maria/ma_delete.c: Fix compiler warning about uninitialised value. storage/maria/ma_loghandler.c: Fix compiler warning about uninitialised value. storage/myisam/ft_stopwords.c: Fix compiler warning. storage/myisam/mi_write.c: Fix compiler warning about possibly uninitialised value, by rewriting a while() loop that is always executed at least once into a do .. while() loop with an assert. storage/xtradb/btr/btr0cur.c: Fix compiler warning about possibly uninitialised value. support-files/compiler_warnings.supp: Fix warning suppression to cover all cases in yassl. vio/viossl.c: Fix compiler warning.
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/* Copyright (C) 2000-2005 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
|
|
|
|
#include "ftdefs.h"
|
|
#include "my_handler.h"
|
|
|
|
typedef struct st_ft_stopwords
|
|
{
|
|
const uchar* pos;
|
|
size_t len;
|
|
} FT_STOPWORD;
|
|
|
|
static TREE *stopwords3=NULL;
|
|
|
|
static int FT_STOPWORD_cmp(void* cmp_arg __attribute__((unused)),
|
|
FT_STOPWORD *w1, FT_STOPWORD *w2)
|
|
{
|
|
return ha_compare_text(default_charset_info,
|
|
w1->pos, w1->len,
|
|
w2->pos, w2->len, 0, 0);
|
|
}
|
|
|
|
static void FT_STOPWORD_free(FT_STOPWORD *w, TREE_FREE action,
|
|
void *arg __attribute__((unused)))
|
|
{
|
|
if (action == free_free)
|
|
my_free((void*) w->pos, MYF(0));
|
|
}
|
|
|
|
static int ft_add_stopword(const char *w)
|
|
{
|
|
FT_STOPWORD sw;
|
|
return !w ||
|
|
(((sw.len= (uint) strlen(sw.pos=(const uchar *)w)) >= ft_min_word_len) &&
|
|
(tree_insert(stopwords3, &sw, 0, stopwords3->custom_arg)==NULL));
|
|
}
|
|
|
|
int ft_init_stopwords()
|
|
{
|
|
DBUG_ENTER("ft_init_stopwords");
|
|
if (!stopwords3)
|
|
{
|
|
if (!(stopwords3=(TREE *)my_malloc(sizeof(TREE),MYF(0))))
|
|
DBUG_RETURN(-1);
|
|
init_tree(stopwords3,0,0,sizeof(FT_STOPWORD),(qsort_cmp2)&FT_STOPWORD_cmp,
|
|
0,
|
|
(ft_stopword_file ? (tree_element_free)&FT_STOPWORD_free : 0),
|
|
NULL);
|
|
}
|
|
|
|
if (ft_stopword_file)
|
|
{
|
|
File fd;
|
|
uint len;
|
|
uchar *buffer;
|
|
const uchar *start, *end;
|
|
FT_WORD w;
|
|
int error=-1;
|
|
|
|
if (!*ft_stopword_file)
|
|
DBUG_RETURN(0);
|
|
|
|
if ((fd=my_open(ft_stopword_file, O_RDONLY, MYF(MY_WME))) == -1)
|
|
DBUG_RETURN(-1);
|
|
len=(uint)my_seek(fd, 0L, MY_SEEK_END, MYF(0));
|
|
my_seek(fd, 0L, MY_SEEK_SET, MYF(0));
|
|
if (!(start=buffer=my_malloc(len+1, MYF(MY_WME))))
|
|
goto err0;
|
|
len=my_read(fd, buffer, len, MYF(MY_WME));
|
|
end=start+len;
|
|
while (ft_simple_get_word(default_charset_info, &start, end, &w, TRUE))
|
|
{
|
|
if (ft_add_stopword(my_strndup((char*) w.pos, w.len, MYF(0))))
|
|
goto err1;
|
|
}
|
|
error=0;
|
|
err1:
|
|
my_free(buffer, MYF(0));
|
|
err0:
|
|
my_close(fd, MYF(MY_WME));
|
|
DBUG_RETURN(error);
|
|
}
|
|
else
|
|
{
|
|
/* compatibility mode: to be removed */
|
|
char **sws=(char **)ft_precompiled_stopwords;
|
|
|
|
for (;*sws;sws++)
|
|
{
|
|
if (ft_add_stopword(*sws))
|
|
DBUG_RETURN(-1);
|
|
}
|
|
ft_stopword_file="(built-in)"; /* for SHOW VARIABLES */
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int is_stopword(const uchar *word, size_t len)
|
|
{
|
|
FT_STOPWORD sw;
|
|
sw.pos=word;
|
|
sw.len=len;
|
|
return tree_search(stopwords3,&sw, stopwords3->custom_arg) != NULL;
|
|
}
|
|
|
|
|
|
void ft_free_stopwords()
|
|
{
|
|
DBUG_ENTER("ft_free_stopwords");
|
|
|
|
if (stopwords3)
|
|
{
|
|
delete_tree(stopwords3); /* purecov: inspected */
|
|
my_free((char*) stopwords3,MYF(0));
|
|
stopwords3=0;
|
|
}
|
|
ft_stopword_file= 0;
|
|
DBUG_VOID_RETURN;
|
|
}
|