diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:40:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:40:36 +0300 |
| commit | ddbc8428546da197a031d24cfcafd1a545467e9b (patch) | |
| tree | dcc59a0d59657900722d4e51c1daeceec81df437 /sql/sql_help.cc | |
| parent | 086ec556f87701cad20a75031d7fb1ab3cd3b350 (diff) | |
| download | mariadb-git-ddbc8428546da197a031d24cfcafd1a545467e9b.tar.gz | |
Portability fixes for windows
After merge fixes
include/my_base.h:
Fix comment syntax
libmysql/client_settings.h:
Portability fixes for windows
libmysql/libmysql.c:
Portability fixes for windows
libmysql/libmysql.def:
Portability fixes for windows
mysql-test/r/variables.result:
Fix result after merge
sql-common/client.c:
Portability fixes for windows
sql/ha_berkeley.cc:
Use defines instead of constants
sql/item_strfunc.cc:
Portability fixes for windows
sql/mysql_priv.h:
Use defines instead of defines
sql/mysqld.cc:
After merge fix
sql/opt_range.h:
After merge fix
sql/set_var.h:
Portability fixes for windows
sql/sql_class.cc:
Defines instead of constants
sql/sql_help.cc:
after merge fixes
More OOM error checking
sql/sql_prepare.cc:
After merge fixes
sql/sql_table.cc:
Portability fixes for windows
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); } |