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
74ca82c8
Commit
74ca82c8
authored
Apr 26, 2006
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.0-16195
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
d89054df
4d392fb9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
mysql-test/r/variables.result
mysql-test/r/variables.result
+14
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+11
-0
sql/set_var.cc
sql/set_var.cc
+2
-2
No files found.
mysql-test/r/variables.result
View file @
74ca82c8
...
...
@@ -590,4 +590,18 @@ show variables like 'sql_big_selects';
Variable_name Value
sql_big_selects ON
set @@sql_big_selects = @old_sql_big_selects;
set @@sql_notes = 0, @@sql_warnings = 0;
show variables like 'sql_notes';
Variable_name Value
sql_notes OFF
show variables like 'sql_warnings';
Variable_name Value
sql_warnings OFF
set @@sql_notes = 1, @@sql_warnings = 1;
show variables like 'sql_notes';
Variable_name Value
sql_notes ON
show variables like 'sql_warnings';
Variable_name Value
sql_warnings ON
End of 5.0 tests
mysql-test/t/variables.test
View file @
74ca82c8
...
...
@@ -480,4 +480,15 @@ set @@sql_big_selects = 1;
show
variables
like
'sql_big_selects'
;
set
@@
sql_big_selects
=
@
old_sql_big_selects
;
#
# Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and
# sql_notes values
#
set
@@
sql_notes
=
0
,
@@
sql_warnings
=
0
;
show
variables
like
'sql_notes'
;
show
variables
like
'sql_warnings'
;
set
@@
sql_notes
=
1
,
@@
sql_warnings
=
1
;
show
variables
like
'sql_notes'
;
show
variables
like
'sql_warnings'
;
--
echo
End
of
5.0
tests
sql/set_var.cc
View file @
74ca82c8
...
...
@@ -996,8 +996,8 @@ struct show_var_st init_vars[]= {
{
sys_sort_buffer
.
name
,
(
char
*
)
&
sys_sort_buffer
,
SHOW_SYS
},
{
sys_big_selects
.
name
,
(
char
*
)
&
sys_big_selects
,
SHOW_SYS
},
{
sys_sql_mode
.
name
,
(
char
*
)
&
sys_sql_mode
,
SHOW_SYS
},
{
"sql_notes"
,
(
char
*
)
&
sys_sql_notes
,
SHOW_
BOOL
},
{
"sql_warnings"
,
(
char
*
)
&
sys_sql_warnings
,
SHOW_
BOOL
},
{
"sql_notes"
,
(
char
*
)
&
sys_sql_notes
,
SHOW_
SYS
},
{
"sql_warnings"
,
(
char
*
)
&
sys_sql_warnings
,
SHOW_
SYS
},
{
sys_storage_engine
.
name
,
(
char
*
)
&
sys_storage_engine
,
SHOW_SYS
},
#ifdef HAVE_REPLICATION
{
sys_sync_binlog_period
.
name
,(
char
*
)
&
sys_sync_binlog_period
,
SHOW_SYS
},
...
...
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