Commit 8be04fd8 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#2775 closes[t:2775] conditionally include tokutek enhancements in the handlerton

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@21722 c7de825b-a66e-492c-adef-691d508d4ae1
parent cf8cdfea
...@@ -6651,9 +6651,11 @@ void ha_tokudb::print_error(int error, myf errflag) { ...@@ -6651,9 +6651,11 @@ void ha_tokudb::print_error(int error, myf errflag) {
error = HA_ERR_LOCK_DEADLOCK; error = HA_ERR_LOCK_DEADLOCK;
if (error == DB_LOCK_NOTGRANTED) if (error == DB_LOCK_NOTGRANTED)
error = HA_ERR_LOCK_WAIT_TIMEOUT; error = HA_ERR_LOCK_WAIT_TIMEOUT;
#if defined(HA_ERR_DISK_FULL)
if (error == ENOSPC) { if (error == ENOSPC) {
error = HA_ERR_DISK_FULL; error = HA_ERR_DISK_FULL;
} }
#endif
if (error == DB_KEYEXIST) { if (error == DB_KEYEXIST) {
error = HA_ERR_FOUND_DUPP_KEY; error = HA_ERR_FOUND_DUPP_KEY;
} }
......
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
#if !defined(HA_CLUSTERING)
#define HA_CLUSTERING 0
#define HA_CLUSTERED_INDEX 0
#endif
#include <db.h> #include <db.h>
#include "hatoku_cmp.h" #include "hatoku_cmp.h"
......
...@@ -1147,21 +1147,25 @@ int tokudb_checkpoint_unlock(THD * thd, stat_print_fn * stat_print) { ...@@ -1147,21 +1147,25 @@ int tokudb_checkpoint_unlock(THD * thd, stat_print_fn * stat_print) {
bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * stat_print, enum ha_stat_type stat_type) { bool tokudb_show_status(handlerton * hton, THD * thd, stat_print_fn * stat_print, enum ha_stat_type stat_type) {
switch (stat_type) { switch (stat_type) {
#if defined(HA_ENGINE_DATA_AMOUNT)
case HA_ENGINE_DATA_AMOUNT: case HA_ENGINE_DATA_AMOUNT:
return tokudb_show_data_size(thd, stat_print, false); return tokudb_show_data_size(thd, stat_print, false);
break; break;
case HA_ENGINE_DATA_EXACT_AMOUNT: case HA_ENGINE_DATA_EXACT_AMOUNT:
return tokudb_show_data_size(thd, stat_print, true); return tokudb_show_data_size(thd, stat_print, true);
break; break;
#endif
case HA_ENGINE_STATUS: case HA_ENGINE_STATUS:
return tokudb_show_engine_status(thd, stat_print); return tokudb_show_engine_status(thd, stat_print);
break; break;
#if defined(HA_ENGINE_CHECKPOINT_LOCK)
case HA_ENGINE_CHECKPOINT_LOCK: case HA_ENGINE_CHECKPOINT_LOCK:
return tokudb_checkpoint_lock(thd, stat_print); return tokudb_checkpoint_lock(thd, stat_print);
break; break;
case HA_ENGINE_CHECKPOINT_UNLOCK: case HA_ENGINE_CHECKPOINT_UNLOCK:
return tokudb_checkpoint_unlock(thd, stat_print); return tokudb_checkpoint_unlock(thd, stat_print);
break; break;
#endif
default: default:
break; break;
} }
......
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