diff options
| author | monty@mysql.com <> | 2004-03-25 22:11:22 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-25 22:11:22 +0200 |
| commit | 1448199bd75009ac9b4aa42c9d4fb8d827a4cb12 (patch) | |
| tree | 36abf1d40f08cd21cd81f6d5966b89ab4e995ac6 /sql/item_cmpfunc.h | |
| parent | eb91f7b478938969b4a182aed5d624c2f8fce38a (diff) | |
| download | mariadb-git-1448199bd75009ac9b4aa42c9d4fb8d827a4cb12.tar.gz | |
Cleanups & safety fixes
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 95520c0c222..cbd1e9feffa 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -991,13 +991,13 @@ public: /* Some usefull inline functions */ -inline Item *and_conds(Item *a, Item *b, TABLE_LIST *tables) +inline Item *and_conds(THD *thd, Item *a, Item *b, TABLE_LIST *tables) { if (!b) return a; if (!a) return b; Item *cond= new Item_cond_and(a,b); if (cond) - cond->fix_fields(current_thd, tables, &cond); + cond->fix_fields(thd, tables, &cond); return cond; } |