Partial whitespace cleanup.

Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc

storage/oqgraph/ha_oqgraph.cc

@@ -28,8 +28,8 @@
 #endif
 
 #include <my_config.h>
+#define MYSQL_SERVER 1                          // to have THD
 
-#define MYSQL_SERVER	// to have THD
 #include <mysql/plugin.h>
 #include "sql_class.h"
 
@@ -572,7 +572,7 @@ int ha_oqgraph::open(const char *name, int mode, uint test_if_locked)
               share->normalized_path.str, share->path.length));
 
   int open_def_flags = 0;
-#if MYSQL_VERSION_ID	>= 100002
+#if MYSQL_VERSION_ID>= 100002
   open_def_flags = GTS_TABLE;
 #endif
   // We want to open the definition for the given backing table
@@ -809,8 +809,7 @@ int ha_oqgraph::delete_row(const byte * buf)
   return HA_ERR_TABLE_READONLY;
 }
 
-int ha_oqgraph::index_read(byte * buf, const byte * key, uint key_len,
-			enum ha_rkey_function find_flag)
+int ha_oqgraph::index_read(byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag)
 {
   DBUG_ASSERT(inited==INDEX);
   // reset before we have a cursor, so the memory is not junk, avoiding the sefgault in position() when select with order by (bug #1133093)
@@ -1141,9 +1140,7 @@ int ha_oqgraph::external_lock(THD *thd, int lock_type)
 }
 
 
-THR_LOCK_DATA **ha_oqgraph::store_lock(THD *thd,
-				       THR_LOCK_DATA **to,
-				       enum thr_lock_type lock_type)
+THR_LOCK_DATA **ha_oqgraph::store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type)
 {
   return edges->file->store_lock(thd, to, lock_type);
 }
@@ -1271,8 +1268,7 @@ ha_rows ha_oqgraph::records_in_range(uint inx, key_range *min_key,
 }
 
 
-int ha_oqgraph::create(const char *name, TABLE *table_arg,
-		    HA_CREATE_INFO *create_info)
+int ha_oqgraph::create(const char *name, TABLE *table_arg, HA_CREATE_INFO *create_info)
 {
   oqgraph_table_option_struct *options=
     reinterpret_cast<oqgraph_table_option_struct*>(table_arg->s->option_struct);