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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4a48f2b3
Commit
4a48f2b3
authored
Oct 18, 2007
by
tnurnberg@sin.intern.azundris.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588
into sin.intern.azundris.com:/misc/mysql/31588/50-31588
parents
7f67efcc
e6ef54b3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
mysql-test/r/variables.result
mysql-test/r/variables.result
+3
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+8
-1
sql/set_var.cc
sql/set_var.cc
+1
-1
No files found.
mysql-test/r/variables.result
View file @
4a48f2b3
...
...
@@ -673,6 +673,9 @@ set @@query_prealloc_size = @test;
select @@query_prealloc_size = @test;
@@query_prealloc_size = @test
1
set global sql_mode=repeat('a',80);
ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
End of 4.1 tests
create table t1 (a int);
select a into @x from t1;
Warnings:
...
...
mysql-test/t/variables.test
View file @
4a48f2b3
...
...
@@ -535,7 +535,14 @@ set @test = @@query_prealloc_size;
set
@@
query_prealloc_size
=
@
test
;
select
@@
query_prealloc_size
=
@
test
;
# End of 4.1 tests
#
# Bug#31588 buffer overrun when setting variables
#
# Buffer-size Off By One. Should throw valgrind-warning without fix #31588.
--
error
1231
set
global
sql_mode
=
repeat
(
'a'
,
80
);
--
echo
End
of
4.1
tests
#
# Bug#6282 Packet error with SELECT INTO
...
...
sql/set_var.cc
View file @
4a48f2b3
...
...
@@ -1752,7 +1752,7 @@ bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names)
&
not_used
));
if
(
error_len
)
{
strmake
(
buff
,
error
,
min
(
sizeof
(
buff
),
error_len
));
strmake
(
buff
,
error
,
min
(
sizeof
(
buff
)
-
1
,
error_len
));
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