mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
76bf7d2224
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log Docs/mysqld_error.txt: Updated error messages Makefile.am: Added missing SSL library (Should be in source distribution) configure.in: Added missing SSL library include/sql_common.h: Move duplicated prototypes innobase/os/os0file.c: Added comment for line that could be removed innobase/srv/srv0srv.c: Added comment for line that could be removed innobase/srv/srv0start.c: Added comment for line that could be removed innobase/trx/trx0sys.c: Added cast to remove compiler warning isam/isamchk.c: Fixed compiler warning libmysql/conf_to_src.c: Include files in proper order myisam/mi_check.c: Removed else part that caused compiler warning myisam/mi_delete.c: Added cast myisam/mi_page.c: Added cast myisam/mi_preload.c: Added cast myisam/mi_write.c: Added cast myisam/myisampack.c: changed 'byte' to 'current_byte' to avoid compiler warnings mysql-test/mysql-test-run.sh: Removed start-from as test '<' is not portable and this can easily be done from command line mysys/hash.c: Added cast mysys/mf_wcomp.c: Removed not reached line mysys/my_append.c: Fixed include file order to get this more portable mysys/my_copy.c: Fixed include file order to get this more portable mysys/my_redel.c: Fixed include file order to get this more portable sql-common/client.c: More DBUG_PRINT sql-common/pack.c: Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed sql/ha_heap.cc: Changed variable names to not cause hidden variables sql/ha_innodb.cc: Changed variable names to not cause hidden variables sql/item.cc: Changed variable names to not cause hidden variables sql/item.h: Changed variable names to not cause hidden variables sql/item_cmpfunc.h: Changed variable names to not cause hidden variables sql/item_func.cc: Changed variable names to not cause hidden variables sql/item_subselect.cc: Changed variable names to not cause hidden variables sql/item_subselect.h: Changed variable names to not cause hidden variables sql/item_sum.cc: Changed variable names to not cause hidden variables sql/item_timefunc.cc: Changed variable names to not cause hidden variables sql/log.cc: Changed variable names to not cause hidden variables sql/protocol.cc: Changed variable names to not cause hidden variables sql/protocol.h: Changed variable names to not cause hidden variables Remove function not declared in protocol.cc sql/protocol_cursor.cc: Changed variable names to not cause hidden variables sql/set_var.cc: Added a lot of 'version_xxx' strings Changed 'bdb_version' to 'version_bdb' sql/sql_class.cc: Changed variable names to not cause hidden variables Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times sql/sql_class.h: Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) sql/sql_derived.cc: Avoid copying TMP_TABLE_PARAM (Use class version instead) sql/sql_error.cc: More DBUG sql/sql_help.cc: Fixed compiler warning sql/sql_lex.cc: Changed variable names to not cause hidden variables sql/sql_list.h: Changed variable names to not cause hidden variables sql/sql_parse.cc: Changed variable names to not cause hidden variables sql/sql_select.cc: Changed variable names to not cause hidden variables Ensure that you don't send NULL to printf() for %s Fixed problem with printing sub selects to debug log sql/sql_select.h: Changed variable names to not cause hidden variables sql/sql_union.cc: Changed variable names to not cause hidden variables Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris) sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Remove warning strings/conf_to_src.c: Fixed include file order
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/* Copyright (C) 2000 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/* Funktions for comparing with wild-cards */
|
|
|
|
#include "mysys_priv.h"
|
|
|
|
/* Test if a string is "comparable" to a wild-card string */
|
|
/* returns 0 if the strings are "comparable" */
|
|
|
|
char wild_many='*';
|
|
char wild_one='?';
|
|
char wild_prefix=0; /* QQ this can potentially cause a SIGSEGV */
|
|
|
|
int wild_compare(register const char *str, register const char *wildstr,
|
|
pbool str_is_pattern)
|
|
{
|
|
char cmp;
|
|
DBUG_ENTER("wild_compare");
|
|
|
|
while (*wildstr)
|
|
{
|
|
while (*wildstr && *wildstr != wild_many && *wildstr != wild_one)
|
|
{
|
|
if (*wildstr == wild_prefix && wildstr[1])
|
|
{
|
|
wildstr++;
|
|
if (str_is_pattern && *str++ != wild_prefix)
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (*wildstr++ != *str++)
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (! *wildstr )
|
|
DBUG_RETURN(*str != 0);
|
|
if (*wildstr++ == wild_one)
|
|
{
|
|
if (! *str || (str_is_pattern && *str == wild_many))
|
|
DBUG_RETURN(1); /* One char; skipp */
|
|
if (*str++ == wild_prefix && str_is_pattern && *str)
|
|
str++;
|
|
}
|
|
else
|
|
{ /* Found '*' */
|
|
while (str_is_pattern && *str == wild_many)
|
|
str++;
|
|
for (; *wildstr == wild_many || *wildstr == wild_one; wildstr++)
|
|
if (*wildstr == wild_many)
|
|
{
|
|
while (str_is_pattern && *str == wild_many)
|
|
str++;
|
|
}
|
|
else
|
|
{
|
|
if (str_is_pattern && *str == wild_prefix && str[1])
|
|
str+=2;
|
|
else if (! *str++)
|
|
DBUG_RETURN (1);
|
|
}
|
|
if (!*wildstr)
|
|
DBUG_RETURN(0); /* '*' as last char: OK */
|
|
if ((cmp= *wildstr) == wild_prefix && wildstr[1] && !str_is_pattern)
|
|
cmp=wildstr[1];
|
|
for (;;str++)
|
|
{
|
|
while (*str && *str != cmp)
|
|
str++;
|
|
if (!*str)
|
|
DBUG_RETURN (1);
|
|
if (wild_compare(str,wildstr,str_is_pattern) == 0)
|
|
DBUG_RETURN (0);
|
|
}
|
|
/* We will never come here */
|
|
}
|
|
}
|
|
DBUG_RETURN (*str != 0);
|
|
} /* wild_compare */
|