diff options
| author | monty@mashka.mysql.fi <> | 2003-10-15 22:40:36 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-15 22:40:36 +0300 |
| commit | 9ef2a83fbe93da4b5d69389e2c5368f96debedc7 (patch) | |
| tree | dcc59a0d59657900722d4e51c1daeceec81df437 /sql/sql_help.cc | |
| parent | e71b53a8fec86ee65c136a9447b56361cbf918fb (diff) | |
| download | mariadb-git-9ef2a83fbe93da4b5d69389e2c5368f96debedc7.tar.gz | |
Portability fixes for windows
After merge fixes
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 02fc8591370..6af4ffde0e1 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -599,7 +599,7 @@ SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, TABLE_LIST *tables, { cond->fix_fields(thd, tables, &cond); // can never fail SQL_SELECT *res= make_select(table,0,0,cond,error); - return (*error || (res && res->check_quick(0, HA_POS_ERROR))) ? 0 : res; + return (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR))) ? 0 : res; } /* @@ -627,6 +627,8 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, uint mlen, Item *cond= new Item_func_like(new Item_field(pfname), new Item_string(mask,mlen,pfname->charset()), (char*) "\\"); + if (thd->is_fatal_error) + return 0; // OOM return prepare_simple_select(thd,cond,tables,table,error); } |