database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
This commit is contained in:
bell@sanja.is.com.ua
2004-03-16 15:14:12 +02:00
parent 7106dcfd06 df842c2fc3
commit b206f29e6c
5 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/variables.result
View File

@ -406,3 +406,13 @@ set @a=@b, @b=@a;
select @a, @b; select @a, @b;
@a @b @a @b
2 1 2 1
set @@global.global.key_buffer_size= 1;
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use
set GLOBAL global.key_buffer_size= 1;
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use
SELECT @@global.global.key_buffer_size;
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use
SELECT @@global.session.key_buffer_size;
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use
SELECT @@global.local.key_buffer_size;
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use

14
mysql-test/t/variables.test
View File

@ -285,3 +285,17 @@ select @@global.max_user_connections,@@local.max_join_size;
set @a=1, @b=2; set @a=1, @b=2;
set @a=@b, @b=@a; set @a=@b, @b=@a;
select @a, @b; select @a, @b;
#
# Bug#2586:Disallow global/session/local as structured var. instance names
#
--error 1149
set @@global.global.key_buffer_size= 1;
--error 1149
set GLOBAL global.key_buffer_size= 1;
--error 1149
SELECT @@global.global.key_buffer_size;
--error 1149
SELECT @@global.session.key_buffer_size;
--error 1149
SELECT @@global.local.key_buffer_size;

16
sql/item_func.cc
View File

@ -29,6 +29,16 @@
#include <ft_global.h> #include <ft_global.h>
bool check_reserved_words(LEX_STRING *name)
{
if (!my_strcasecmp(system_charset_info, name->str, "GLOBAL") ||
!my_strcasecmp(system_charset_info, name->str, "LOCAL") ||
!my_strcasecmp(system_charset_info, name->str, "SESSION"))
return TRUE;
return FALSE;
}
static void my_coll_agg_error(DTCollation &c1, DTCollation &c2, static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,
const char *fname) const char *fname)
{ {
@ -2957,6 +2967,12 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name,
(uint) strlen(server_version), (uint) strlen(server_version),
system_charset_info); system_charset_info);
if (name.str && component.str && check_reserved_words(&name))
{
net_printf(thd, ER_SYNTAX_ERROR);
return 0;
}
Item *item; Item *item;
sys_var *var; sys_var *var;
char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos; char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos;

3
sql/mysql_priv.h
View File

@ -751,6 +751,9 @@ bool open_log(MYSQL_LOG *log, const char *hostname,
/* mysqld.cc */ /* mysqld.cc */
extern void yyerror(const char*); extern void yyerror(const char*);
/* item_func.cc */
extern bool check_reserved_words(LEX_STRING *name);
/* strfunc.cc */ /* strfunc.cc */
ulonglong find_set(TYPELIB *typelib,const char *x, uint length, ulonglong find_set(TYPELIB *typelib,const char *x, uint length,
char **err_pos, uint *err_len, bool *set_warning); char **err_pos, uint *err_len, bool *set_warning);

5
sql/sql_yacc.yy
View File

@ -5034,6 +5034,11 @@ internal_variable_name:
} }
| ident '.' ident | ident '.' ident
{ {
if (check_reserved_words(&$1))
{
net_printf(YYTHD, ER_SYNTAX_ERROR);
YYABORT;
}
sys_var *tmp=find_sys_var($3.str, $3.length); sys_var *tmp=find_sys_var($3.str, $3.length);
if (!tmp) if (!tmp)
YYABORT; YYABORT;