WL# 2094, This patch is on top of 1.1814, 1.1846, 1.1856, which contain fixes

for bugs 8033, 8065, 8535, 8582

This particular changeset contains style changes per code review suggestions 
and does not contain bug fixes in of itself.

ha_federated.h:
  standardised code style to conform to internals.texi
ha_federated.cc:
  more code standardisation to conform to internals.texi.
  - casts
  - declarations
  - comments
  - 80 char width
  also, append using string1.append(string2) and not 
  string1.append(string2.c_ptr_quick())

1 files changed, 9 insertions, 3 deletions

diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index 04bbf2a56f6..e75fd285338 100755
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -73,7 +73,8 @@ private:
       return errorcode otherwise
   */
   uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);
-  bool ha_federated::create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); 
+  bool ha_federated::create_where_from_key(String *to, KEY *key_info, 
+                                           const byte *key, uint key_length); 
 
 public:
   ha_federated(TABLE *table): handler(table),
@@ -127,11 +128,16 @@ public:
   /*
     Called in test_quick_select to determine if indexes should be used.
   */
-  virtual double scan_time() { DBUG_PRINT("ha_federated::scan_time", ("rows %d", records)); return (double)(records*2); }
+  virtual double scan_time()
+  {
+    DBUG_PRINT("ha_federated::scan_time",
+               ("rows %d", records)); return (double)(records*2); 
+  }
   /*
     The next method will never be called if you do not implement indexes.
   */
-  virtual double read_time(uint index, uint ranges, ha_rows rows) { return (double) rows /  20.0+1; }
+  virtual double read_time(uint index, uint ranges, ha_rows rows) 
+  { return (double) rows /  20.0+1; }
 
   /*
     Everything below are methods that we implment in ha_federated.cc.