mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
c1488c7e58
Changed errmsg -> my_errmsg (portability issue) Fixed that mysqlbinlog writes SET TIMESTAMP before all queries Fixed comments in default my.cnf files Docs/manual.texi: Updated information about character sets client/mysqladmin.c: Added missing help text client/mysqltest.c: Changed --replace to --replace_result to not conflict with SQL replace command include/my_sys.h: change errmsg -> my_errmsg (portability issue) libmysql/errmsg.c: change errmsg -> my_errmsg (portability issue) myisam/mi_cache.c: Changed seek+read to pread myisam/mi_check.c: Fix bug that caused myisamchk to be very slow under some specific error conditions myisam/mi_dynrec.c: cleanup myisam/myisamchk.c: Write out value of checksum myisam/myisamdef.h: cleanup mysql-test/r/backup.result: Fixed the case where backup caused different error messages mysql-test/r/bdb.result: Added new test case mysql-test/r/fulltext.result: Fix for new CREATE TABLE format mysql-test/t/backup.test: Use --replace_result and --send mysql-test/t/bdb.test: New test case mysql-test/t/status.test: Use --send mysys/errors.c: change errmsg -> my_errmsg (portability issue) mysys/my_error.c: change errmsg -> my_errmsg (portability issue) mysys/typelib.c: Only accept full type names sql/derror.cc: change errmsg -> my_errmsg (portability issue) sql/ha_berkeley.cc: Fixed bug when using key parts that could be NULL sql/log_event.cc: Log SET TIMESTAMP before all queries sql/mysqlbinlog.cc: Incremented version number sql/mysqld.cc: change errmsg -> my_errmsg (portability issue) Always accept --skip-gemeni, --skip-bdb and --skip-innobase sql/slave.cc: cleanup sql/sql_base.cc: cleanup sql/sql_db.cc: cleanup support-files/my-huge.cnf.sh: Remove usage of # at end of line support-files/my-large.cnf.sh: Remove usage of # at end of line support-files/my-medium.cnf.sh: Remove usage of # at end of line support-files/my-small.cnf.sh: Remove usage of # at end of line
106 lines
3 KiB
C
106 lines
3 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
/* Functions to handle typelib */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
|
|
/***************************************************************************
|
|
** Search after a fieldtype. Endspace in x is not compared.
|
|
** If part, uniq field is found and full_name == 0 then x is expanded
|
|
** to full field.
|
|
** full_name has the following bit values:
|
|
** If & 1 accept only whole names
|
|
** If & 2 don't expand if half field
|
|
** If & 4 allow #number# as type
|
|
****************************************************************************/
|
|
|
|
int find_type(my_string x, TYPELIB *typelib, uint full_name)
|
|
{
|
|
int find,pos,findpos;
|
|
reg1 my_string i;
|
|
reg2 const char *j;
|
|
DBUG_ENTER("find_type");
|
|
DBUG_PRINT("enter",("x: '%s' lib: %lx",x,typelib));
|
|
|
|
if (!typelib->count)
|
|
{
|
|
DBUG_PRINT("exit",("no count"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
LINT_INIT(findpos);
|
|
find=0;
|
|
for (pos=0 ; (j=typelib->type_names[pos]) ; pos++)
|
|
{
|
|
for (i=x ; *i && toupper(*i) == toupper(*j) ; i++, j++) ;
|
|
if (! *j)
|
|
{
|
|
while (*i == ' ')
|
|
i++; /* skipp_end_space */
|
|
if (! *i)
|
|
DBUG_RETURN(pos+1);
|
|
}
|
|
if (! *i && (!*j || !(full_name & 1)))
|
|
{
|
|
find++;
|
|
findpos=pos;
|
|
}
|
|
}
|
|
if (find == 0 && (full_name & 4) && x[0] == '#' && strend(x)[-1] == '#' &&
|
|
(findpos=atoi(x+1)-1) >= 0 && (uint) findpos < typelib->count)
|
|
find=1;
|
|
else if (find == 0 || ! x[0])
|
|
{
|
|
DBUG_PRINT("exit",("Couldn't find type"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
else if (find != 1 || (full_name & 1))
|
|
{
|
|
DBUG_PRINT("exit",("Too many possybilities"));
|
|
DBUG_RETURN(-1);
|
|
}
|
|
if (!(full_name & 2))
|
|
(void) strmov(x,typelib->type_names[findpos]);
|
|
DBUG_RETURN(findpos+1);
|
|
} /* find_type */
|
|
|
|
|
|
/* Get name of type nr 'nr' */
|
|
/* Warning first type is 1, 0 = empty field */
|
|
|
|
void make_type(register my_string to, register uint nr, register TYPELIB *typelib)
|
|
{
|
|
DBUG_ENTER("make_type");
|
|
if (!nr)
|
|
to[0]=0;
|
|
else
|
|
(void) strmov(to,get_type(typelib,nr-1));
|
|
DBUG_VOID_RETURN;
|
|
} /* make_type */
|
|
|
|
|
|
/* Get type */
|
|
/* Warning first type is 0 */
|
|
|
|
const char *get_type(TYPELIB *typelib, uint nr)
|
|
{
|
|
if (nr < (uint) typelib->count && typelib->type_names)
|
|
return(typelib->type_names[nr]);
|
|
return "?";
|
|
}
|