diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
| commit | 9016688fca04deb8f838f83269fd9b99c88aa5ac (patch) | |
| tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /mysql-test/r/mysql.result | |
| parent | a4d61391c61bf770e37b2f26c0304d334e0b1eb7 (diff) | |
| parent | f411e63c98f4340aafa5677ef1650cb945f1387a (diff) | |
| download | mariadb-git-9016688fca04deb8f838f83269fd9b99c88aa5ac.tar.gz | |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 366052af95e..b2d4531d0ad 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -397,9 +397,9 @@ WARNING: --server-arg option not supported in this configuration. +---+ | 1 | +---+ -Warning (Code 1286): Unknown table engine 'nonexistent' +Warning (Code 1286): Unknown storage engine 'nonexistent' Warning (Code 1266): Using storage engine MyISAM for table 't2' -Warning (Code 1286): Unknown table engine 'nonexistent2' +Warning (Code 1286): Unknown storage engine 'nonexistent2' Warning (Code 1266): Using storage engine MyISAM for table 't2' Error (Code 1050): Table 't2' already exists drop tables t1, t2; |