diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-18 10:51:10 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-18 10:51:10 +0200 |
| commit | b088967252dd925f6aa6c9270744374f80fb47e8 (patch) | |
| tree | 8717318dd6e068daea01d3cbcb85aeba8f2f25ab /mysql-test | |
| parent | 62a7e160bc0e960ec1374a546dde4a7f26120ceb (diff) | |
| parent | cd9d89a75d4cd5e9408cd34e6229910acf23cdc1 (diff) | |
| download | mariadb-git-b088967252dd925f6aa6c9270744374f80fb47e8.tar.gz | |
Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588
into sin.intern.azundris.com:/misc/mysql/31588/50-31588
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
SCCS merged
mysql-test/t/variables.test:
SCCS merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 3d76f8e4a90..d5fc8f57f8a 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -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: diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 0ad85a32568..ed9fc91587d 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -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 |