Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
2d3840f5
Commit
2d3840f5
authored
Oct 14, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug in SET enum_system_variable=NULL
parent
c95d142f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
.bzrignore
.bzrignore
+1
-0
mysql-test/r/variables.result
mysql-test/r/variables.result
+2
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+2
-0
sql/set_var.cc
sql/set_var.cc
+6
-5
No files found.
.bzrignore
View file @
2d3840f5
...
@@ -539,3 +539,4 @@ scripts/make_win_src_distribution
...
@@ -539,3 +539,4 @@ scripts/make_win_src_distribution
libmysql/vio_priv.h
libmysql/vio_priv.h
libmysql_r/vio_priv.h
libmysql_r/vio_priv.h
hardcopy.0
hardcopy.0
scripts/make_sharedlib_distribution
mysql-test/r/variables.result
View file @
2d3840f5
...
@@ -244,6 +244,8 @@ set myisam_max_sort_file_size=100;
...
@@ -244,6 +244,8 @@ set myisam_max_sort_file_size=100;
Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
set myisam_max_extra_sort_file_size=100;
set myisam_max_extra_sort_file_size=100;
Variable 'myisam_max_extra_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
Variable 'myisam_max_extra_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
set @@SQL_WARNINGS=NULL;
Variable 'sql_warnings' can't be set to the value of 'NULL'
set autocommit=1;
set autocommit=1;
set big_tables=1;
set big_tables=1;
select @@autocommit, @@big_tables;
select @@autocommit, @@big_tables;
...
...
mysql-test/t/variables.test
View file @
2d3840f5
...
@@ -153,6 +153,8 @@ select @@global.sql_auto_is_null;
...
@@ -153,6 +153,8 @@ select @@global.sql_auto_is_null;
set
myisam_max_sort_file_size
=
100
;
set
myisam_max_sort_file_size
=
100
;
--
error
1229
--
error
1229
set
myisam_max_extra_sort_file_size
=
100
;
set
myisam_max_extra_sort_file_size
=
100
;
--
error
1231
set
@@
SQL_WARNINGS
=
NULL
;
# Test setting all variables
# Test setting all variables
...
...
sql/set_var.cc
View file @
2d3840f5
...
@@ -394,9 +394,9 @@ sys_var *sys_variables[]=
...
@@ -394,9 +394,9 @@ sys_var *sys_variables[]=
&
sys_quote_show_create
,
&
sys_quote_show_create
,
&
sys_rand_seed1
,
&
sys_rand_seed1
,
&
sys_rand_seed2
,
&
sys_rand_seed2
,
&
sys_range_alloc_block_size
,
&
sys_read_buff_size
,
&
sys_read_buff_size
,
&
sys_read_rnd_buff_size
,
&
sys_read_rnd_buff_size
,
&
sys_range_alloc_block_size
,
&
sys_rpl_recovery_rank
,
&
sys_rpl_recovery_rank
,
&
sys_safe_updates
,
&
sys_safe_updates
,
&
sys_select_limit
,
&
sys_select_limit
,
...
@@ -555,11 +555,11 @@ struct show_var_st init_vars[]= {
...
@@ -555,11 +555,11 @@ struct show_var_st init_vars[]= {
{
sys_query_cache_type
.
name
,
(
char
*
)
&
sys_query_cache_type
,
SHOW_SYS
},
{
sys_query_cache_type
.
name
,
(
char
*
)
&
sys_query_cache_type
,
SHOW_SYS
},
#endif
/* HAVE_QUERY_CACHE */
#endif
/* HAVE_QUERY_CACHE */
{
sys_query_prealloc_size
.
name
,
(
char
*
)
&
sys_query_prealloc_size
,
SHOW_SYS
},
{
sys_query_prealloc_size
.
name
,
(
char
*
)
&
sys_query_prealloc_size
,
SHOW_SYS
},
{
sys_range_alloc_block_size
.
name
,
(
char
*
)
&
sys_range_alloc_block_size
,
SHOW_SYS
},
{
sys_read_buff_size
.
name
,
(
char
*
)
&
sys_read_buff_size
,
SHOW_SYS
},
{
sys_read_buff_size
.
name
,
(
char
*
)
&
sys_read_buff_size
,
SHOW_SYS
},
{
sys_readonly
.
name
,
(
char
*
)
&
sys_readonly
,
SHOW_SYS
},
{
sys_readonly
.
name
,
(
char
*
)
&
sys_readonly
,
SHOW_SYS
},
{
sys_read_rnd_buff_size
.
name
,(
char
*
)
&
sys_read_rnd_buff_size
,
SHOW_SYS
},
{
sys_read_rnd_buff_size
.
name
,(
char
*
)
&
sys_read_rnd_buff_size
,
SHOW_SYS
},
{
sys_range_alloc_block_size
.
name
,
(
char
*
)
&
sys_range_alloc_block_size
,
SHOW_SYS
},
{
sys_rpl_recovery_rank
.
name
,(
char
*
)
&
sys_rpl_recovery_rank
,
SHOW_SYS
},
{
sys_rpl_recovery_rank
.
name
,(
char
*
)
&
sys_rpl_recovery_rank
,
SHOW_SYS
},
{
sys_server_id
.
name
,
(
char
*
)
&
sys_server_id
,
SHOW_SYS
},
{
sys_server_id
.
name
,
(
char
*
)
&
sys_server_id
,
SHOW_SYS
},
{
sys_slave_net_timeout
.
name
,(
char
*
)
&
sys_slave_net_timeout
,
SHOW_SYS
},
{
sys_slave_net_timeout
.
name
,(
char
*
)
&
sys_slave_net_timeout
,
SHOW_SYS
},
...
@@ -972,7 +972,8 @@ byte *sys_var_thd_bool::value_ptr(THD *thd, enum_var_type type)
...
@@ -972,7 +972,8 @@ byte *sys_var_thd_bool::value_ptr(THD *thd, enum_var_type type)
bool
sys_var
::
check_enum
(
THD
*
thd
,
set_var
*
var
,
TYPELIB
*
enum_names
)
bool
sys_var
::
check_enum
(
THD
*
thd
,
set_var
*
var
,
TYPELIB
*
enum_names
)
{
{
char
buff
[
80
],
*
value
;
char
buff
[
80
];
const
char
*
value
;
String
str
(
buff
,
sizeof
(
buff
)),
*
res
;
String
str
(
buff
,
sizeof
(
buff
)),
*
res
;
if
(
var
->
value
->
result_type
()
==
STRING_RESULT
)
if
(
var
->
value
->
result_type
()
==
STRING_RESULT
)
...
@@ -982,7 +983,7 @@ bool sys_var::check_enum(THD *thd, set_var *var, TYPELIB *enum_names)
...
@@ -982,7 +983,7 @@ bool sys_var::check_enum(THD *thd, set_var *var, TYPELIB *enum_names)
(
ulong
)
find_type
(
res
->
c_ptr
(),
enum_names
,
3
)
-
1
))
(
ulong
)
find_type
(
res
->
c_ptr
(),
enum_names
,
3
)
-
1
))
<
0
)
<
0
)
{
{
value
=
res
->
c_ptr
()
;
value
=
res
?
res
->
c_ptr
()
:
"NULL"
;
goto
err
;
goto
err
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment