1 files changed, 42 insertions, 32 deletions

diff --git a/storage/tokudb/tokudb_information_schema.cc b/storage/tokudb/tokudb_information_schema.cc
index bb263d5f960..0b9882060cd 100644
--- a/storage/tokudb/tokudb_information_schema.cc
+++ b/storage/tokudb/tokudb_information_schema.cc
@@ -68,12 +68,10 @@ struct trx_extra_t {
     TABLE *table;
 };
 
-int trx_callback(
-    DB_TXN* txn,
-    iterate_row_locks_callback iterate_locks,
-    void* locks_extra,
-    void *extra) {
-
+int trx_callback(DB_TXN* txn,
+                 TOKUDB_UNUSED(iterate_row_locks_callback iterate_locks),
+                 TOKUDB_UNUSED(void* locks_extra),
+                 void* extra) {
     uint64_t txn_id = txn->id64(txn);
     uint64_t client_id;
     txn->get_client_id(txn, &client_id, NULL);
@@ -92,9 +90,9 @@ int trx_callback(
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int trx_fill_table(THD* thd, TABLE_LIST* tables, Item* cond) {
+int trx_fill_table(THD* thd, TABLE_LIST* tables, TOKUDB_UNUSED(Item* cond)) {
 #else
-int trx_fill_table(THD* thd, TABLE_LIST* tables, COND* cond) {
+int trx_fill_table(THD* thd, TABLE_LIST* tables, TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -122,7 +120,7 @@ int trx_init(void* p) {
     return 0;
 }
 
-int trx_done(void* p) {
+int trx_done(TOKUDB_UNUSED(void* p)) {
     return 0;
 }
 
@@ -190,13 +188,13 @@ int lock_waits_callback(
     size_t dname_length = strlen(dname);
     table->field[2]->store(dname, dname_length, system_charset_info);
     String left_str;
-    tokudb_pretty_left_key(db, left_key, &left_str);
+    tokudb_pretty_left_key(left_key, &left_str);
     table->field[3]->store(
         left_str.ptr(),
         left_str.length(),
         system_charset_info);
     String right_str;
-    tokudb_pretty_right_key(db, right_key, &right_str);
+    tokudb_pretty_right_key(right_key, &right_str);
     table->field[4]->store(
         right_str.ptr(),
         right_str.length(),
@@ -227,9 +225,13 @@ int lock_waits_callback(
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int lock_waits_fill_table(THD* thd, TABLE_LIST* tables, Item* cond) {
+int lock_waits_fill_table(THD* thd,
+                          TABLE_LIST* tables,
+                          TOKUDB_UNUSED(Item* cond)) {
 #else
-int lock_waits_fill_table(THD* thd, TABLE_LIST* tables, COND* cond) {
+int lock_waits_fill_table(THD* thd,
+                          TABLE_LIST* tables,
+                          TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -260,7 +262,7 @@ int lock_waits_init(void* p) {
     return 0;
 }
 
-int lock_waits_done(void *p) {
+int lock_waits_done(TOKUDB_UNUSED(void *p)) {
     return 0;
 }
 
@@ -333,14 +335,14 @@ int locks_callback(
         table->field[2]->store(dname, dname_length, system_charset_info);
 
         String left_str;
-        tokudb_pretty_left_key(db, &left_key, &left_str);
+        tokudb_pretty_left_key(&left_key, &left_str);
         table->field[3]->store(
             left_str.ptr(),
             left_str.length(),
             system_charset_info);
 
         String right_str;
-        tokudb_pretty_right_key(db, &right_key, &right_str);
+        tokudb_pretty_right_key(&right_key, &right_str);
         table->field[4]->store(
             right_str.ptr(),
             right_str.length(),
@@ -370,9 +372,9 @@ int locks_callback(
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int locks_fill_table(THD* thd, TABLE_LIST* tables, Item* cond) {
+int locks_fill_table(THD* thd, TABLE_LIST* tables, TOKUDB_UNUSED(Item* cond)) {
 #else
-int locks_fill_table(THD* thd, TABLE_LIST* tables, COND* cond) {
+int locks_fill_table(THD* thd, TABLE_LIST* tables, TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -400,7 +402,7 @@ int locks_init(void* p) {
     return 0;
 }
 
-int locks_done(void* p) {
+int locks_done(TOKUDB_UNUSED(void* p)) {
     return 0;
 }
 
@@ -513,9 +515,13 @@ cleanup:
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int file_map_fill_table(THD* thd, TABLE_LIST* tables, Item* cond) {
+int file_map_fill_table(THD* thd,
+                        TABLE_LIST* tables,
+                        TOKUDB_UNUSED(Item* cond)) {
 #else
-int file_map_fill_table(THD* thd, TABLE_LIST* tables, COND* cond) {
+int file_map_fill_table(THD* thd,
+                        TABLE_LIST* tables,
+                        TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -543,7 +549,7 @@ int file_map_init(void* p) {
     return 0;
 }
 
-int file_map_done(void* p) {
+int file_map_done(TOKUDB_UNUSED(void* p)) {
     return 0;
 }
 
@@ -718,9 +724,13 @@ cleanup:
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int fractal_tree_info_fill_table(THD* thd, TABLE_LIST* tables, Item* cond) {
+int fractal_tree_info_fill_table(THD* thd,
+                                 TABLE_LIST* tables,
+                                 TOKUDB_UNUSED(Item* cond)) {
 #else
-int fractal_tree_info_fill_table(THD* thd, TABLE_LIST* tables, COND* cond) {
+int fractal_tree_info_fill_table(THD* thd,
+                                 TABLE_LIST* tables,
+                                 TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -751,7 +761,7 @@ int fractal_tree_info_init(void* p) {
     return 0;
 }
 
-int fractal_tree_info_done(void* p) {
+int fractal_tree_info_done(TOKUDB_UNUSED(void* p)) {
     return 0;
 }
 
@@ -1012,12 +1022,12 @@ cleanup:
 int fractal_tree_block_map_fill_table(
     THD* thd,
     TABLE_LIST* tables,
-    Item* cond) {
+    TOKUDB_UNUSED(Item* cond)) {
 #else
 int fractal_tree_block_map_fill_table(
     THD* thd,
     TABLE_LIST* tables,
-    COND* cond) {
+    TOKUDB_UNUSED(COND* cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -1048,7 +1058,7 @@ int fractal_tree_block_map_init(void* p) {
     return 0;
 }
 
-int fractal_tree_block_map_done(void *p) {
+int fractal_tree_block_map_done(TOKUDB_UNUSED(void *p)) {
     return 0;
 }
 
@@ -1087,7 +1097,7 @@ ST_FIELD_INFO background_job_status_field_info[] = {
     {"scheduler", 32, MYSQL_TYPE_STRING, 0, 0, NULL, SKIP_OPEN_TABLE },
     {"scheduled_time", 0, MYSQL_TYPE_DATETIME, 0, 0, NULL, SKIP_OPEN_TABLE },
     {"started_time", 0, MYSQL_TYPE_DATETIME, 0, MY_I_S_MAYBE_NULL, NULL, SKIP_OPEN_TABLE },
-    {"status", 1024, MYSQL_TYPE_STRING, 0, MY_I_S_MAYBE_NULL, SKIP_OPEN_TABLE },
+    {"status", 1024, MYSQL_TYPE_STRING, 0, MY_I_S_MAYBE_NULL, NULL, SKIP_OPEN_TABLE },
     {NULL, 0, MYSQL_TYPE_NULL, 0, 0, NULL, SKIP_OPEN_TABLE}
 };
 
@@ -1154,9 +1164,9 @@ int report_background_job_status(TABLE *table, THD *thd) {
 }
 
 #if MYSQL_VERSION_ID >= 50600
-int background_job_status_fill_table(THD *thd, TABLE_LIST *tables, Item *cond) {
+int background_job_status_fill_table(THD *thd, TABLE_LIST *tables, TOKUDB_UNUSED(Item *cond)) {
 #else
-int background_job_status_fill_table(THD *thd, TABLE_LIST *tables, COND *cond) {
+int background_job_status_fill_table(THD *thd, TABLE_LIST *tables, TOKUDB_UNUSED(COND *cond)) {
 #endif
     TOKUDB_DBUG_ENTER("");
     int error;
@@ -1184,7 +1194,7 @@ int background_job_status_init(void* p) {
     return 0;
 }
 
-int background_job_status_done(void* p) {
+int background_job_status_done(TOKUDB_UNUSED(void* p)) {
     return 0;
 }