diff options
| author | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
|---|---|---|
| committer | unknown <jani@linux-th5m.site> | 2007-05-24 15:26:10 +0300 |
| commit | 6356f5631c1b6dab40b747abe54797f1779aef80 (patch) | |
| tree | 95c9c78dd2df7c497babc3d932ae30ceb98d1296 /sql/item_subselect.cc | |
| parent | 7932fb543241d77c0f10e172d144273e3c640512 (diff) | |
| parent | 6e849907977dd503ad82b9aa5039d17b5db1d7b7 (diff) | |
| download | mariadb-git-6356f5631c1b6dab40b747abe54797f1779aef80.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into linux-th5m.site:/home/my/mysql-5.1-marvel
include/keycache.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/my_static.c:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_preload.c:
Auto merged
mysys/mf_keycache.c:
Manual merge from main 5.1
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index ab4b4eb6796..9494d1dc2ee 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -149,7 +149,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref) DBUG_ASSERT(fixed == 0); engine->set_thd((thd= thd_param)); - if (check_stack_overrun(thd, STACK_MIN_SIZE, (gptr)&res)) + if (check_stack_overrun(thd, STACK_MIN_SIZE, (uchar*)&res)) return TRUE; res= engine->prepare(); @@ -206,7 +206,7 @@ err: bool Item_subselect::walk(Item_processor processor, bool walk_subquery, - byte *argument) + uchar *argument) { if (walk_subquery) @@ -449,7 +449,7 @@ Item_singlerow_subselect::select_transformer(JOIN *join) 'upper' select is not really dependent => we remove this dependence */ substitution->walk(&Item::remove_dependence_processor, 0, - (byte *) select_lex->outer_select()); + (uchar *) select_lex->outer_select()); return RES_REDUCE; } return RES_OK; |