Post-merge fixes.

sql/ha_partition.cc:
  Post-merge fixes.
  The new function HA_EXTRA_INSERT_WITH_UPDATE needs to be handled in
  ha_partition::extra().
storage/federated/ha_federated.cc:
  Post-merge fixes.
  Removed leftover characters.
  Added a missing brace.
  Fixed and improved parenthesis handling in ha_federated::append_stmt_insert().
  Moved code from HA_EXTRA_RESET to ha_federated::reset().
storage/federated/ha_federated.h:
  Post-merge fixes.
  Changed byte to uchar.
  Added declaration for ha_federated::reset().

1 files changed, 4 insertions, 3 deletions

diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index 399451888e2..3443194817b 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -107,9 +107,9 @@ private:
 
   bool append_stmt_insert(String *query);
 
-  int read_next(byte *buf, MYSQL_RES *result);
-  int index_read_idx_with_result_set(byte *buf, uint index,
-                                     const byte *key,
+  int read_next(uchar *buf, MYSQL_RES *result);
+  int index_read_idx_with_result_set(uchar *buf, uint index,
+                                     const uchar *key,
                                      uint key_len,
                                      ha_rkey_function find_flag,
                                      MYSQL_RES **result);
@@ -251,5 +251,6 @@ public:
   int connection_rollback();
   int connection_autocommit(bool state);
   int execute_simple_query(const char *query, int len);
+  int reset(void);
 };