diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 15:36:55 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 15:36:55 +0400 |
| commit | 6b684c5806e0728b42c5c0ab7ae9939ab9dfec93 (patch) | |
| tree | 049b7373511d6970d58fb06d12c2cf4cdc532269 /mysql-test/r/func_str.result | |
| parent | c30d924dd5485f24818264d8e533820bcf1bcba0 (diff) | |
| download | mariadb-git-6b684c5806e0728b42c5c0ab7ae9939ab9dfec93.tar.gz | |
Fix test results after the latest merge.
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 39d11aa3e2c..779a125c5cc 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2566,7 +2566,7 @@ SELECT format(12345678901234567890.123, 3, NULL); format(12345678901234567890.123, 3, NULL) 12,345,678,901,234,567,890.123 Warnings: -Warning 1647 Unknown locale: 'NULL' +Warning 1649 Unknown locale: 'NULL' SELECT format(12345678901234567890.123, 3, 'ar_AE'); format(12345678901234567890.123, 3, 'ar_AE') 12,345,678,901,234,567,890.123 @@ -2686,5 +2686,5 @@ SELECT format(123, 1, 'Non-existent-locale'); format(123, 1, 'Non-existent-locale') 123.0 Warnings: -Warning 1647 Unknown locale: 'Non-existent-locale' +Warning 1649 Unknown locale: 'Non-existent-locale' End of 5.4 tests |