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

Manual merge from 5.1

Browse Source
This commit is contained in:
Mattias Jonsson
2011-04-20 19:53:08 +02:00
parent 1d75aeb9a9 b3d86f12eb
commit f7b98c25f4
12 changed files with 350 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.h
View File

@@ -1262,7 +1262,7 @@ public:
DBUG_ASSERT(locked == FALSE);
DBUG_ASSERT(inited == NONE);
}
virtual handler *clone(MEM_ROOT *mem_root);
virtual handler *clone(const char *name, MEM_ROOT *mem_root);
/** This is called after create to allow us to set up cached variables */
void init()
{