diff options
| author | guilhem@mysql.com <> | 2004-11-25 01:09:04 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2004-11-25 01:09:04 +0100 |
| commit | 2e6d5760534c0a4238c0df67a0d1a8214b4e7df9 (patch) | |
| tree | 45f1ac17fad9cfdbbe4e0231c6c890d0d22994f4 /sql | |
| parent | 213e61d339d7fe4ed408e74befc4e970d5acdf5f (diff) | |
| parent | d913f4e4abfccdc4206ed72eaf48d82bc6635e6c (diff) | |
| download | mariadb-git-2e6d5760534c0a4238c0df67a0d1a8214b4e7df9.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4c652ee972a..eaa44e2f5ef 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -238,7 +238,7 @@ bool handle_select(THD *thd, LEX *lex, select_result *result) /* If we have real error reported erly then this will be ignored */ - result->send_error(ER_UNKNOWN_ERROR, NullS); + result->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR)); result->abort(); } DBUG_RETURN(res); |