database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge of BUG#26624 and BUG#26625

Browse Source 
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
This commit is contained in:
unknown
2007-03-29 10:35:28 +04:00
parent ec3de56263 9b358f811b
commit bedd5b8766
5 changed files with 195 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_list.h
View File

@@ -23,7 +23,7 @@
class Sql_alloc
{
public:
static void *operator new(size_t size)
static void *operator new(size_t size) throw ()
{
return (void*) sql_alloc((uint) size);
}
@@ -31,9 +31,9 @@ public:
{
return (void*) sql_alloc((uint) size);
}
static void *operator new[](size_t size, MEM_ROOT *mem_root)
static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
{ return (void*) alloc_root(mem_root, (uint) size); }
static void *operator new(size_t size, MEM_ROOT *mem_root)
static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
{ return (void*) alloc_root(mem_root, (uint) size); }
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root)