diff options
| author | Kristofer Pettersson <kpettersson@mysql.com> | 2008-09-20 16:45:39 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kpettersson@mysql.com> | 2008-09-20 16:45:39 +0200 |
| commit | 119c5aaeba2b35f201bdbd98c0714be9b6a780fb (patch) | |
| tree | 720ae8c4fe37780d4e41cfc36be9f91a5b1f8e5b /mysql-test | |
| parent | fa490eb9334c00c3e64009829abfdc5e281b3740 (diff) | |
| parent | f0352e346a1a7dbf056ac87239ed9b407d70886b (diff) | |
| download | mariadb-git-119c5aaeba2b35f201bdbd98c0714be9b6a780fb.tar.gz | |
Automerge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/sp.test | 18 |
2 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index be21251d92e..e788d30a14b 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -6662,6 +6662,16 @@ drop procedure p1; drop function f1; drop view v1; drop table t1; +drop procedure if exists `p2` $ +create procedure `p2`(in `a` text charset utf8) +begin +declare `pos` int default 1; +declare `str` text charset utf8; +set `str` := `a`; +select substr(`str`, `pos`+ 1 ) into `str`; +end $ +call `p2`('s s s s s s'); +drop procedure `p2`; # ------------------------------------------------------------------ # -- End of 5.0 tests # ------------------------------------------------------------------ diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 87ab1d2f0d9..21ca2528e4f 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -7818,6 +7818,24 @@ drop function f1; drop view v1; drop table t1; +# +# Bug#38469 invalid memory read and/or crash with utf8 text field, stored procedure, uservar +# +delimiter $; +--disable_warnings +drop procedure if exists `p2` $ +--enable_warnings +create procedure `p2`(in `a` text charset utf8) +begin + declare `pos` int default 1; + declare `str` text charset utf8; + set `str` := `a`; + select substr(`str`, `pos`+ 1 ) into `str`; +end $ +delimiter ;$ +call `p2`('s s s s s s'); +drop procedure `p2`; + --echo # ------------------------------------------------------------------ --echo # -- End of 5.0 tests --echo # ------------------------------------------------------------------ |