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/r/func_str.result | |
| 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/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 94149d8eae0..c96fb0fe257 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1960,4 +1960,16 @@ NULL SELECT UNHEX('G') IS NULL; UNHEX('G') IS NULL 1 +SELECT INSERT('abc', 3, 3, '1234'); +INSERT('abc', 3, 3, '1234') +ab1234 +SELECT INSERT('abc', 4, 3, '1234'); +INSERT('abc', 4, 3, '1234') +abc1234 +SELECT INSERT('abc', 5, 3, '1234'); +INSERT('abc', 5, 3, '1234') +abc +SELECT INSERT('abc', 6, 3, '1234'); +INSERT('abc', 6, 3, '1234') +abc End of 5.0 tests |