mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch '5.5' into 10.0

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2018-01-24 12:29:31 +02:00
commit d833bb65d5
153 changed files with 1984 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/federatedx/ha_federatedx.h
View file

@ -169,7 +169,7 @@ public:
static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
{ return alloc_root(mem_root, size); }
static void operator delete(void *ptr, size_t size)
{ TRASH(ptr, size); }
{ TRASH_FREE(ptr, size); }
virtual int query(const char *buffer, uint length)=0;
virtual FEDERATEDX_IO_RESULT *store_result()=0;