diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 2c066c8da1c..cc6b9016bfb 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -47,7 +47,7 @@ static const int max_transactions= 256;
 static const ha_rows autoincrement_prefetch= 32;
 
 // connectstring to cluster if given by mysqld
-const char *ndbcluster_connectstring = 0;
+const char *ndbcluster_connectstring= 0;
 
 #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
 
@@ -3379,7 +3379,8 @@ bool ndbcluster_init()
 {
   DBUG_ENTER("ndbcluster_init");
   // Set connectstring if specified
-  if (ndbcluster_connectstring != 0) {
+  if (ndbcluster_connectstring != 0)
+  {
     DBUG_PRINT("connectstring", ("%s", ndbcluster_connectstring));     
     Ndb::setConnectString(ndbcluster_connectstring);
   }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9c72a38bd49..c95c9f5e79f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5977,15 +5977,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   }
   case OPT_BDB_SHARED:
     berkeley_init_flags&= ~(DB_PRIVATE);
-    berkeley_shared_data=1;
+    berkeley_shared_data= 1;
     break;
 #endif /* HAVE_BERKELEY_DB */
   case OPT_BDB:
 #ifdef HAVE_BERKELEY_DB
     if (opt_bdb)
-      have_berkeley_db=SHOW_OPTION_YES;
+      have_berkeley_db= SHOW_OPTION_YES;
     else
-      have_berkeley_db=SHOW_OPTION_DISABLED;
+      have_berkeley_db= SHOW_OPTION_DISABLED;
 #endif
     break;
   case OPT_ISAM:
@@ -5999,27 +5999,27 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case OPT_NDBCLUSTER:
 #ifdef HAVE_NDBCLUSTER_DB
     if (opt_ndbcluster)
-      have_ndbcluster=SHOW_OPTION_YES;
+      have_ndbcluster= SHOW_OPTION_YES;
     else
-      have_ndbcluster=SHOW_OPTION_DISABLED;
+      have_ndbcluster= SHOW_OPTION_DISABLED;
 #endif
     break;
   case OPT_NDB_CONNECTSTRING:
 #ifdef HAVE_NDBCLUSTER_DB
-    have_ndbcluster=SHOW_OPTION_YES;
+    have_ndbcluster= SHOW_OPTION_YES;
 #endif
     break;
   case OPT_INNODB:
 #ifdef HAVE_INNOBASE_DB
     if (opt_innodb)
-      have_innodb=SHOW_OPTION_YES;
+      have_innodb= SHOW_OPTION_YES;
     else
-      have_innodb=SHOW_OPTION_DISABLED;
+      have_innodb= SHOW_OPTION_DISABLED;
 #endif
     break;
   case OPT_INNODB_DATA_FILE_PATH:
 #ifdef HAVE_INNOBASE_DB
-    innobase_data_file_path=argument;
+    innobase_data_file_path= argument;
 #endif
     break;
 #ifdef HAVE_INNOBASE_DB