diff options
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index e1a8906a4aa..88dee1ae067 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2025,7 +2025,7 @@ template <class T> inline Item* get_item_copy (THD *thd, T* item) { Item *copy= new (get_thd_memroot(thd)) T(*item); - if (copy) + if (likely(copy)) copy->register_in(thd); return copy; } @@ -2162,7 +2162,7 @@ public: Item_args(THD *thd, Item *a, Item *b, Item *c) { arg_count= 0; - if ((args= (Item**) thd_alloc(thd, sizeof(Item*) * 3))) + if (likely((args= (Item**) thd_alloc(thd, sizeof(Item*) * 3)))) { arg_count= 3; args[0]= a; args[1]= b; args[2]= c; @@ -2171,7 +2171,7 @@ public: Item_args(THD *thd, Item *a, Item *b, Item *c, Item *d) { arg_count= 0; - if ((args= (Item**) thd_alloc(thd, sizeof(Item*) * 4))) + if (likely((args= (Item**) thd_alloc(thd, sizeof(Item*) * 4)))) { arg_count= 4; args[0]= a; args[1]= b; args[2]= c; args[3]= d; @@ -2180,7 +2180,7 @@ public: Item_args(THD *thd, Item *a, Item *b, Item *c, Item *d, Item* e) { arg_count= 5; - if ((args= (Item**) thd_alloc(thd, sizeof(Item*) * 5))) + if (likely((args= (Item**) thd_alloc(thd, sizeof(Item*) * 5)))) { arg_count= 5; args[0]= a; args[1]= b; args[2]= c; args[3]= d; args[4]= e; |