mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
1ad5bb1a69
Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables Bug#20415 Output of mysqld --help --verbose is incomplete Bug#25430 variable not found in SELECT @@global.ft_max_word_len; Bug#32902 plugin variables don't know their names Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting! Bug#34829 No default value for variable and setting default does not raise error Bug#34834 ? Is accepted as a valid sql mode Bug#34878 Few variables have default value according to documentation but error occurs Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var. Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status Bug#40988 log_output_basic.test succeeded though syntactically false. Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails) Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled Bug#44797 plugins w/o command-line options have no disabling option in --help Bug#46314 string system variables don't support expressions Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken Bug#46586 When using the plugin interface the type "set" for options caused a crash. Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds Bug#49417 some complaints about mysqld --help --verbose output Bug#49540 DEFAULT value of binlog_format isn't the default value Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix) Bug#49644 init_connect and \0 Bug#49645 init_slave and multi-byte characters Bug#49646 mysql --show-warnings crashes when server dies CMakeLists.txt: Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled client/mysql.cc: don't crash with --show-warnings when mysqld dies config/ac-macros/plugins.m4: Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled include/my_getopt.h: comments include/my_pthread.h: fix double #define mysql-test/mysql-test-run.pl: run sys_vars suite by default properly recognize envirinment variables (e.g. MTR_MAX_SAVE_CORE) set to 0 escape gdb command line arguments mysql-test/suite/sys_vars/r/rpl_init_slave_func.result: init_slave+utf8 bug mysql-test/suite/sys_vars/t/rpl_init_slave_func.test: init_slave+utf8 bug mysys/my_getopt.c: Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting! Bug#46586 When using the plugin interface the type "set" for options caused a crash. Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix) mysys/typelib.c: support for flagset sql/ha_ndbcluster.cc: backport from telco tree sql/item_func.cc: Bug#49644 init_connect and \0 Bug#49645 init_slave and multi-byte characters sql/sql_builtin.cc.in: Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled sql/sql_plugin.cc: Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled Bug#32902 plugin variables don't know their names Bug#44797 plugins w/o command-line options have no disabling option in --help sql/sys_vars.cc: all server variables are defined here storage/myisam/ft_parser.c: remove unnecessary updates of param->quot storage/myisam/ha_myisam.cc: myisam_* variables belong here strings/my_vsnprintf.c: %o and %llx unittest/mysys/my_vsnprintf-t.c: %o and %llx tests vio/viosocket.c: bugfix: fix @@wait_timeout to work with socket timeouts (vs. alarm thread)
388 lines
10 KiB
C
388 lines
10 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; 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 */
|
|
|
|
/* Functions to handle typelib */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
|
|
|
|
#define is_field_separator(X) ((X) == ',' || (X) == '=')
|
|
|
|
int find_type_or_exit(const char *x, TYPELIB *typelib, const char *option)
|
|
{
|
|
int res;
|
|
const char **ptr;
|
|
|
|
if ((res= find_type((char *) x, typelib, 2)) <= 0)
|
|
{
|
|
ptr= typelib->type_names;
|
|
if (!*x)
|
|
fprintf(stderr, "No option given to %s\n", option);
|
|
else
|
|
fprintf(stderr, "Unknown option to %s: %s\n", option, x);
|
|
fprintf(stderr, "Alternatives are: '%s'", *ptr);
|
|
while (*++ptr)
|
|
fprintf(stderr, ",'%s'", *ptr);
|
|
fprintf(stderr, "\n");
|
|
exit(1);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
/**
|
|
Search after a string in a list of strings. Endspace in x is not compared.
|
|
|
|
@param x String to find
|
|
@param lib TYPELIB (struct of pointer to values + count)
|
|
@param full_name bitmap of what to do
|
|
If & 1 accept only whole names
|
|
If & 2 don't expand if half field
|
|
If & 4 allow #number# as type
|
|
If & 8 use ',' as string terminator
|
|
|
|
@note
|
|
If part, uniq field is found and full_name == 0 then x is expanded
|
|
to full field.
|
|
|
|
@retval
|
|
-1 Too many matching values
|
|
@retval
|
|
0 No matching value
|
|
@retval
|
|
>0 Offset+1 in typelib for matched string
|
|
*/
|
|
|
|
|
|
int find_type(char *x, const TYPELIB *typelib, uint full_name)
|
|
{
|
|
int find,pos;
|
|
int UNINIT_VAR(findpos); /* guarded by find */
|
|
reg1 char * i;
|
|
reg2 const char *j;
|
|
DBUG_ENTER("find_type");
|
|
DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) typelib));
|
|
|
|
if (!typelib->count)
|
|
{
|
|
DBUG_PRINT("exit",("no count"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
find=0;
|
|
for (pos=0 ; (j=typelib->type_names[pos]) ; pos++)
|
|
{
|
|
for (i=x ;
|
|
*i && (!(full_name & 8) || !is_field_separator(*i)) &&
|
|
my_toupper(&my_charset_latin1,*i) ==
|
|
my_toupper(&my_charset_latin1,*j) ; i++, j++) ;
|
|
if (! *j)
|
|
{
|
|
while (*i == ' ')
|
|
i++; /* skip_end_space */
|
|
if (! *i || ((full_name & 8) && is_field_separator(*i)))
|
|
DBUG_RETURN(pos+1);
|
|
}
|
|
if ((!*i && (!(full_name & 8) || !is_field_separator(*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
|
|
|
|
@note
|
|
first type is 1, 0 = empty field
|
|
*/
|
|
|
|
void make_type(register char * 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
|
|
|
|
@note
|
|
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 "?";
|
|
}
|
|
|
|
|
|
/**
|
|
Create an integer value to represent the supplied comma-seperated
|
|
string where each string in the TYPELIB denotes a bit position.
|
|
|
|
@param x string to decompose
|
|
@param lib TYPELIB (struct of pointer to values + count)
|
|
@param err index (not char position) of string element which was not
|
|
found or 0 if there was no error
|
|
|
|
@retval
|
|
a integer representation of the supplied string
|
|
*/
|
|
|
|
my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
|
|
{
|
|
my_ulonglong result;
|
|
int find;
|
|
char *i;
|
|
DBUG_ENTER("find_set");
|
|
DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) lib));
|
|
|
|
if (!lib->count)
|
|
{
|
|
DBUG_PRINT("exit",("no count"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
result= 0;
|
|
*err= 0;
|
|
while (*x)
|
|
{
|
|
(*err)++;
|
|
i= x;
|
|
while (*x && !is_field_separator(*x))
|
|
x++;
|
|
if (x[0] && x[1]) /* skip separator if found */
|
|
x++;
|
|
if ((find= find_type(i, lib, 2 | 8) - 1) < 0)
|
|
DBUG_RETURN(0);
|
|
result|= (ULL(1) << find);
|
|
}
|
|
*err= 0;
|
|
DBUG_RETURN(result);
|
|
} /* find_set */
|
|
|
|
|
|
/**
|
|
Create a copy of a specified TYPELIB structure.
|
|
|
|
@param root pointer to a MEM_ROOT object for allocations
|
|
@param from pointer to a source TYPELIB structure
|
|
|
|
@retval
|
|
pointer to the new TYPELIB structure on successful copy
|
|
@retval
|
|
NULL otherwise
|
|
*/
|
|
|
|
TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from)
|
|
{
|
|
TYPELIB *to;
|
|
uint i;
|
|
|
|
if (!from)
|
|
return NULL;
|
|
|
|
if (!(to= (TYPELIB*) alloc_root(root, sizeof(TYPELIB))))
|
|
return NULL;
|
|
|
|
if (!(to->type_names= (const char **)
|
|
alloc_root(root, (sizeof(char *) + sizeof(int)) * (from->count + 1))))
|
|
return NULL;
|
|
to->type_lengths= (unsigned int *)(to->type_names + from->count + 1);
|
|
to->count= from->count;
|
|
if (from->name)
|
|
{
|
|
if (!(to->name= strdup_root(root, from->name)))
|
|
return NULL;
|
|
}
|
|
else
|
|
to->name= NULL;
|
|
|
|
for (i= 0; i < from->count; i++)
|
|
{
|
|
if (!(to->type_names[i]= strmake_root(root, from->type_names[i],
|
|
from->type_lengths[i])))
|
|
return NULL;
|
|
to->type_lengths[i]= from->type_lengths[i];
|
|
}
|
|
to->type_names[to->count]= NULL;
|
|
to->type_lengths[to->count]= 0;
|
|
|
|
return to;
|
|
}
|
|
|
|
|
|
static const char *on_off_default_names[]= { "off","on","default", 0};
|
|
static TYPELIB on_off_default_typelib= {array_elements(on_off_default_names)-1,
|
|
"", on_off_default_names, 0};
|
|
|
|
/**
|
|
Parse a TYPELIB name from the buffer
|
|
|
|
@param lib Set of names to scan for.
|
|
@param strpos INOUT Start of the buffer (updated to point to the next
|
|
character after the name)
|
|
@param end End of the buffer
|
|
|
|
@note
|
|
The buffer is assumed to contain one of the names specified in the TYPELIB,
|
|
followed by comma, '=', or end of the buffer.
|
|
|
|
@retval
|
|
0 No matching name
|
|
@retval
|
|
>0 Offset+1 in typelib for matched name
|
|
*/
|
|
|
|
static uint parse_name(const TYPELIB *lib, const char **strpos, const char *end)
|
|
{
|
|
const char *pos= *strpos;
|
|
uint find= find_type((char*)pos, lib, 8);
|
|
for (; pos != end && *pos != '=' && *pos !=',' ; pos++);
|
|
*strpos= pos;
|
|
return find;
|
|
}
|
|
|
|
/**
|
|
Parse and apply a set of flag assingments
|
|
|
|
@param lib Flag names
|
|
@param default_name Number of "default" in the typelib
|
|
@param cur_set Current set of flags (start from this state)
|
|
@param default_set Default set of flags (use this for assign-default
|
|
keyword and flag=default assignments)
|
|
@param str String to be parsed
|
|
@param length Length of the string
|
|
@param err_pos OUT If error, set to point to start of wrong set string
|
|
NULL on success
|
|
@param err_len OUT If error, set to the length of wrong set string
|
|
|
|
@details
|
|
Parse a set of flag assignments, that is, parse a string in form:
|
|
|
|
param_name1=value1,param_name2=value2,...
|
|
|
|
where the names are specified in the TYPELIB, and each value can be
|
|
either 'on','off', or 'default'. Setting the same name twice is not
|
|
allowed.
|
|
|
|
Besides param=val assignments, we support the "default" keyword (keyword
|
|
#default_name in the typelib). It can be used one time, if specified it
|
|
causes us to build the new set over the default_set rather than cur_set
|
|
value.
|
|
|
|
@note
|
|
it's not charset aware
|
|
|
|
@retval
|
|
Parsed set value if (*errpos == NULL), otherwise undefined
|
|
*/
|
|
|
|
my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name,
|
|
my_ulonglong cur_set, my_ulonglong default_set,
|
|
const char *str, uint length,
|
|
char **err_pos, uint *err_len)
|
|
{
|
|
const char *end= str + length;
|
|
my_ulonglong flags_to_set= 0, flags_to_clear= 0, res;
|
|
my_bool set_defaults= 0;
|
|
|
|
*err_pos= 0; // No error yet
|
|
if (str != end)
|
|
{
|
|
const char *start= str;
|
|
for (;;)
|
|
{
|
|
const char *pos= start;
|
|
uint flag_no, value;
|
|
|
|
if (!(flag_no= parse_name(lib, &pos, end)))
|
|
goto err;
|
|
|
|
if (flag_no == default_name)
|
|
{
|
|
/* Using 'default' twice isn't allowed. */
|
|
if (set_defaults)
|
|
goto err;
|
|
set_defaults= TRUE;
|
|
}
|
|
else
|
|
{
|
|
my_ulonglong bit= (1ULL << (flag_no - 1));
|
|
/* parse the '=on|off|default' */
|
|
if ((flags_to_clear | flags_to_set) & bit ||
|
|
pos >= end || *pos++ != '=' ||
|
|
!(value= parse_name(&on_off_default_typelib, &pos, end)))
|
|
goto err;
|
|
|
|
if (value == 1) // this is '=off'
|
|
flags_to_clear|= bit;
|
|
else if (value == 2) // this is '=on'
|
|
flags_to_set|= bit;
|
|
else // this is '=default'
|
|
{
|
|
if (default_set & bit)
|
|
flags_to_set|= bit;
|
|
else
|
|
flags_to_clear|= bit;
|
|
}
|
|
}
|
|
if (pos >= end)
|
|
break;
|
|
|
|
if (*pos++ != ',')
|
|
goto err;
|
|
|
|
start=pos;
|
|
continue;
|
|
err:
|
|
*err_pos= (char*)start;
|
|
*err_len= end - start;
|
|
break;
|
|
}
|
|
}
|
|
res= set_defaults? default_set : cur_set;
|
|
res|= flags_to_set;
|
|
res&= ~flags_to_clear;
|
|
return res;
|
|
}
|
|
|