fix the DEBUG=0 build. addresses #317

git-svn-id: file:///svn/mysql/tokudb-engine/src@3072 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/Makefile.tokutek

@@ -17,9 +17,11 @@ endif
 ifeq ($(DEBUG),0)
 OPTFLAGS = -O2
 MYSQL_FLAGS = 
+CXXFLAGS =
 else
 OPTFLAGS = -O0
 MYSQL_FLAGS = -DHAVE_CONFIG_H -DDBUG_ON -DSAFE_MUTEX -DEXTRA_DEBUG -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX
+CXXFLAGS = -Wall -Werror
 endif
 
 MYSQL_FLAGS += -DMYSQL_DYNAMIC_PLUGIN
@@ -28,7 +30,7 @@ MYSQL_CXXFLAGS = -fno-implicit-templates -fno-exceptions -fno-rtti
 CPPFLAGS = -I. -I$(MYSQL_SRC)/sql -I$(MYSQL_SRC)/include -I$(MYSQL_SRC)/regex -I$(TOKUDB)/include
 CPPFLAGS += $(MYSQL_FLAGS)
 CPPFLAGS += -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\"
-CXXFLAGS = -Wall -Werror -g $(OPTFLAGS) $(GCOV_FLAGS) $(MYSQL_CXXFLAGS)
+CXXFLAGS += -g $(OPTFLAGS) $(GCOV_FLAGS) $(MYSQL_CXXFLAGS)
 CXXFLAGS += -fPIC
 LDFLAGS = -fPIC -shared -Wl,-soname -Wl,libtokudb_engine.so
 LIBS  = -L$(TOKUDB)/lib -ltokudb -lpthread -lz -lstdc++ -lm -lgcc_s -lc

storage/tokudb/ha_tokudb.cc

@@ -95,7 +95,11 @@ static char *tokudb_log_dir;
 static ulong tokudb_trans_retry = 1;
 static ulong tokudb_max_lock;
 static ulong tokudb_debug;
-static char* tokudb_version = TOKUDB_VERSION;
+#ifdef TOKUDB_VERSION
+static char *tokudb_version = TOKUDB_VERSION;
+#else
+static char *tokudb_version;
+#endif
 
 static DB_ENV *db_env;
 
@@ -1141,7 +1145,7 @@ void ha_tokudb::get_status() {
         pthread_mutex_lock(&share->mutex);
 
         (void) extra(HA_EXTRA_KEYREAD);
-        read_last();
+        error = read_last();
         (void) extra(HA_EXTRA_NO_KEYREAD);
 
         if (error == 0) {