diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-09 13:05:41 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-09 13:05:41 +0200 |
| commit | c7de22a1c7f073c916225ec1b0fa55930b6e58f8 (patch) | |
| tree | e0fd5e93a4c1c0522319df2ab0237b94b8dd0ee8 /mysql-test/t/func_str.test | |
| parent | 76542acdcee892dccbc8305d0d13b95d0c57da85 (diff) | |
| parent | 29b6d554028cd40459061b22d216c3b16cf6298e (diff) | |
| download | mariadb-git-c7de22a1c7f073c916225ec1b0fa55930b6e58f8.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
sql/item_strfunc.cc:
Auto merged
mysql-test/r/func_str.result:
resolved test merge conflicts
mysql-test/t/func_str.test:
resolved test merge conflicts
Diffstat (limited to 'mysql-test/t/func_str.test')
| -rw-r--r-- | mysql-test/t/func_str.test | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index b074e6139e9..56098ad345e 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1008,7 +1008,6 @@ select repeat('a', cast(2 as unsigned int)); select rpad('abc', cast(5 as unsigned integer), 'x'); select lpad('abc', cast(5 as unsigned integer), 'x'); - # # Bug #25197 :repeat function returns null when using table field directly as count # @@ -1036,4 +1035,12 @@ DROP TABLE t1; SELECT UNHEX('G'); SELECT UNHEX('G') IS NULL; +# +# Bug #26281: INSERT() function mishandles NUL on boundary condition +# +SELECT INSERT('abc', 3, 3, '1234'); +SELECT INSERT('abc', 4, 3, '1234'); +SELECT INSERT('abc', 5, 3, '1234'); +SELECT INSERT('abc', 6, 3, '1234'); + --echo End of 5.0 tests |