diff options
| author | bell@sanja.is.com.ua <> | 2003-01-30 22:15:44 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-01-30 22:15:44 +0200 |
| commit | e294751c41b12f7093ef51297af50c3a306f2b6a (patch) | |
| tree | 217655eeaecf53f6696533c8e56d67c74da274b7 /sql/sql_union.cc | |
| parent | 2f04313db5696f016fedd5abb7c3eaa2cf0c2cb4 (diff) | |
| download | mariadb-git-e294751c41b12f7093ef51297af50c3a306f2b6a.tar.gz | |
fixed bug in determinating uncacheable queries
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index dde0251d0c2..f734978a866 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -203,7 +203,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result, (ORDER*) NULL, sl, this, 0, tables_OK); tables_OK= 0; - if (res | thd->fatal_error) + if (res | thd->is_fatal_error) goto err; } item_list.empty(); @@ -220,7 +220,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result, } } - DBUG_RETURN(res | thd->fatal_error); + DBUG_RETURN(res | thd->is_fatal_error); err: thd->lex.current_select= lex_select_save; DBUG_RETURN(-1); @@ -293,7 +293,7 @@ int st_select_lex_unit::exec() thd->lex.select_lex.ftfunc_list= &empty_list; #endif - if (!thd->fatal_error) // Check if EOM + if (!thd->is_fatal_error) // Check if EOM { SELECT_LEX *sl=thd->lex.current_select->master_unit()->first_select(); offset_limit_cnt= (sl->braces) ? global_parameters->offset_limit : 0; |