Commit 12e9c9c2 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses build

get handlerton compiling again

git-svn-id: file:///svn/mysql/tokudb-engine/src@11212 c7de825b-a66e-492c-adef-691d508d4ae1
parent bff3f0b9
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
#define MYSQL_SERVER 1 #define MYSQL_SERVER 1
#include "mysql_priv.h" #include "mysql_priv.h"
#include "hatoku_cmp.h" #include "hatoku_cmp.h"
...@@ -3530,6 +3529,13 @@ THR_LOCK_DATA **ha_tokudb::store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_l ...@@ -3530,6 +3529,13 @@ THR_LOCK_DATA **ha_tokudb::store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_l
} }
int toku_dbt_up(DB*,
u_int32_t old_version, const DBT *old_descriptor, const DBT *old_key, const DBT *old_val,
u_int32_t new_version, const DBT *new_descriptor, const DBT *new_key, const DBT *new_val) {
assert(false);
return 0;
}
static int create_sub_table(const char *table_name, int flags , DBT* row_descriptor) { static int create_sub_table(const char *table_name, int flags , DBT* row_descriptor) {
TOKUDB_DBUG_ENTER("create_sub_table"); TOKUDB_DBUG_ENTER("create_sub_table");
int error; int error;
...@@ -3546,7 +3552,7 @@ static int create_sub_table(const char *table_name, int flags , DBT* row_descrip ...@@ -3546,7 +3552,7 @@ static int create_sub_table(const char *table_name, int flags , DBT* row_descrip
file->set_flags(file, flags); file->set_flags(file, flags);
error = file->set_descriptor(file, row_descriptor); error = file->set_descriptor(file, 0, row_descriptor, toku_dbt_up);
if (error) { if (error) {
DBUG_PRINT("error", ("Got error: %d when setting row descriptor for table '%s'", error, table_name)); DBUG_PRINT("error", ("Got error: %d when setting row descriptor for table '%s'", error, table_name));
goto exit; goto exit;
...@@ -3849,7 +3855,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in ...@@ -3849,7 +3855,7 @@ int ha_tokudb::create(const char *name, TABLE * form, HA_CREATE_INFO * create_in
false, false,
NULL NULL
); );
error = status_block->set_descriptor(status_block, &row_descriptor); error = status_block->set_descriptor(status_block, 0, &row_descriptor, toku_dbt_up);
if (error) { if (error) {
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment