diff options
| author | malff/marcsql@weblab.(none) <> | 2006-11-02 11:01:53 -0700 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2006-11-02 11:01:53 -0700 |
| commit | 62c242cc75b34c34d52ba792c57126ca4bfbccbf (patch) | |
| tree | 6858415854d15b55cafbf65946d71a1878a9459b /sql/item_geofunc.h | |
| parent | e2d8d522930303008e175998c4faf6cb35b75007 (diff) | |
| download | mariadb-git-62c242cc75b34c34d52ba792c57126ca4bfbccbf.tar.gz | |
Bug#21114 (Foreign key creation fails to table with name format)
Due to the complexity of this change, everything is documented in WL#3565
This patch is the third iteration, it takes into account the comments
received to date.
Diffstat (limited to 'sql/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index 4848f59301d..42f11820869 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -348,11 +348,11 @@ public: void fix_length_and_dec() { max_length= 10; } }; -#define GEOM_NEW(obj_constructor) new obj_constructor +#define GEOM_NEW(thd, obj_constructor) new (thd->mem_root) obj_constructor #else /*HAVE_SPATIAL*/ -#define GEOM_NEW(obj_constructor) NULL +#define GEOM_NEW(thd, obj_constructor) NULL #endif |