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

Merge with MySQL 5.1.57/58

Browse source 
Moved some BSD string functions from Unireg
This commit is contained in:
Michael Widenius 2011-05-02 20:58:45 +03:00
commit e415ba0fb2
538 changed files with 9684 additions and 3379 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/maria/ha_maria.cc
View file

@ -789,9 +789,10 @@ can_enable_indexes(1), bulk_insert_single_undo(BULK_INSERT_NONE)
{}
handler *ha_maria::clone(MEM_ROOT *mem_root)
handler *ha_maria::clone(const char *name, MEM_ROOT *mem_root)
{
ha_maria *new_handler= static_cast <ha_maria *>(handler::clone(mem_root));
ha_maria *new_handler= static_cast <ha_maria *>(handler::clone(name,
mem_root));
if (new_handler)
{
new_handler->file->state= file->state;

2
storage/maria/ha_maria.h
View file

@ -51,7 +51,7 @@ class ha_maria :public handler
public:
ha_maria(handlerton *hton, TABLE_SHARE * table_arg);
~ha_maria() {}
handler *clone(MEM_ROOT *mem_root);
handler *clone(const char *name, MEM_ROOT *mem_root);
const char *table_type() const
{ return "MARIA"; }
const char *index_type(uint key_number);

1
storage/maria/ma_init.c
View file

@ -21,6 +21,7 @@
#include "trnman_public.h"
#include "ma_checkpoint.h"
#include <hash.h>
#include <my_handler.h>
void history_state_free(MARIA_STATE_HISTORY_CLOSED *closed_history)
{