diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-05-27 18:19:44 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-05-27 18:19:44 +0300 |
| commit | 9f74930de671fe261193b4ae198b77761fbbcdc7 (patch) | |
| tree | ef20b1214af011ce8ef6a3fb904fb115e723cb71 /sql/sql_derived.cc | |
| parent | a6ccad60b46d25e4bf0833262f1b96ba2712c7a4 (diff) | |
| parent | bbe29a00d3ca24d4aa9c8c3b7c3f7bd8bcbd3389 (diff) | |
| download | mariadb-git-9f74930de671fe261193b4ae198b77761fbbcdc7.tar.gz | |
merged 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 41be98621a6..37adf5c403a 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -179,6 +179,7 @@ exit: { if (thd->is_error() && (thd->main_da.sql_errno() == ER_BAD_FIELD_ERROR || + thd->main_da.sql_errno() == ER_FUNC_INEXISTENT_NAME_COLLISION || thd->main_da.sql_errno() == ER_SP_DOES_NOT_EXIST)) { thd->clear_error(); |