#2940 port the handlerton to 5.5.6-rc

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

storage/tokudb/ha_tokudb.cc

@@ -3,7 +3,7 @@
 #endif
 
 #define MYSQL_SERVER 1
-#include "mysql_priv.h"
+#include "toku_mysql_priv.h"
 #include "hatoku_cmp.h"
 extern "C" {
 #include "stdint.h"

storage/tokudb/ha_tokudb.h

@@ -505,3 +505,15 @@ class ha_tokudb : public handler {
     int read_last(uint keynr);
 };
 
+#if MYSQL_VERSION_ID >= 50506
+
+static inline void my_free(void *p, int arg) {
+    my_free(p);
+}
+
+static inline void *memcpy_fixed(void *a, const void *b, size_t n) {
+    return memcpy(a, b, n);
+}
+
+#endif
+

storage/tokudb/hatoku_cmp.cc

-#include "mysql_priv.h"
+#include "toku_mysql_priv.h"
 
 extern "C" {
 #include "stdint.h"

storage/tokudb/hatoku_cmp.h

 #ifndef _HATOKU_CMP
 #define _HATOKU_CMP
 
-#include "mysql_priv.h"
+#include "toku_mysql_priv.h"
 
 extern "C" {
 #include "stdint.h"

storage/tokudb/hatoku_hton.cc

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #define MYSQL_SERVER 1
-#include "mysql_priv.h"
+#include "toku_mysql_priv.h"
 #include <db.h>
 
 extern "C" {
@@ -890,6 +890,8 @@ static int tokudb_get_user_data_size(THD *thd, bool exact, u_int64_t *data_size_
     return error;
 }
 
+#if TOKU_INCLUDE_SHOW_DATA_AMOUNT
+
 static bool tokudb_show_data_size(THD * thd, stat_print_fn * stat_print, bool exact) {
     TOKUDB_DBUG_ENTER("tokudb_show_data_size");
     uint64_t data_size = 0;
@@ -910,6 +912,8 @@ static bool tokudb_show_data_size(THD * thd, stat_print_fn * stat_print, bool ex
     TOKUDB_DBUG_RETURN(error);
 }
 
+#endif
+
 #define STATPRINT(legend, val) stat_print(thd, \
                                           tokudb_hton_name, \
                                           tokudb_hton_name_length, \
@@ -1376,7 +1380,7 @@ struct st_mysql_storage_engine tokudb_storage_engine = { MYSQL_HANDLERTON_INTERF
 
 static ST_FIELD_INFO tokudb_user_data_field_info[] = {
     {"User Data Size", 8, MYSQL_TYPE_LONGLONG, 0, 0, "user data size", SKIP_OPEN_TABLE },
-    {NULL, 0, MYSQL_TYPE_NULL, NULL, NULL, NULL, NULL}
+    {NULL, 0, MYSQL_TYPE_NULL, 0, 0, NULL, SKIP_OPEN_TABLE}
 };
 
 static int tokudb_user_data_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
@@ -1405,7 +1409,7 @@ struct st_mysql_information_schema tokudb_user_data_information_schema = { MYSQL
 
 static ST_FIELD_INFO tokudb_user_data_exact_field_info[] = {
     {"User Data Size", 8, MYSQL_TYPE_LONGLONG, 0, 0, "user data size", SKIP_OPEN_TABLE },
-    {NULL, 0, MYSQL_TYPE_NULL, NULL, NULL, NULL, NULL}
+    {NULL, 0, MYSQL_TYPE_NULL, 0, 0, NULL, SKIP_OPEN_TABLE}
 };
 
 static int tokudb_user_data_exact_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {

storage/tokudb/toku_mysql_priv.h

+#if !defined(TOKU_MYSQL_PRIV_H)
+#define TOKUMYSQL_PRIV_H
+#include "mysql_version.h"
+#if MYSQL_VERSION_ID < 50506
+#include "mysql_priv.h"
+#else
+#include "sql_table.h"
+#include "handler.h"
+#include "table.h"
+#include "log.h"
+#include "sql_class.h"
+#include "sql_show.h"
+#endif
+#endif