diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 20:59:08 +0400 |
| commit | e02ad98c63506c3260ac3a365e72886d7d02304a (patch) | |
| tree | 88ff7149921c8f4e47d5a628bfdc8f4241ad8c06 /mysql-test/r/mysqltest.result | |
| parent | 7876d53b5f17e2c906f41d97e22514c1e36640bb (diff) | |
| parent | d79d0c4045f5b93ded001ca6b963727b3362cd15 (diff) | |
| download | mariadb-git-e02ad98c63506c3260ac3a365e72886d7d02304a.tar.gz | |
Merge 5.5 -> 10.0-base
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 811861a6d93..7228daa2712 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -232,7 +232,7 @@ mysqltest: At line 2: Spurious text after `query` expression mysqltest: At line 1: Missing argument(s) to 'error' mysqltest: At line 1: Missing argument(s) to 'error' mysqltest: At line 1: The sqlstate definition must start with an uppercase S -mysqltest: At line 1: The error name definition must start with an uppercase E or W +mysqltest: At line 1: The error name definition must start with an uppercase E or W or H mysqltest: At line 1: Invalid argument to error: '9eeeee' - the errno may only consist of digits[0-9] mysqltest: At line 1: Invalid argument to error: '1sssss' - the errno may only consist of digits[0-9] mysqltest: At line 1: The sqlstate must be exactly 5 chars long |