Remove compiler warnings

mysql-test/mysql-test-run.pl:
  Fix warning when using --extern
sql/field.cc:
  Fix wrong fix
sql/ha_ndbcluster.cc:
  Better fixes to remove compiler warnings
sql/ha_ndbcluster_binlog.cc:
  Better fixes to remove compiler warnings
sql/log.cc:
  Fix compiler warnings
sql/sql_parse.cc:
  Indentation fix
sql/sql_table.cc:
  Indentation fixes
storage/myisammrg/ha_myisammrg.cc:
  Fix compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix compiler warnings
support-files/compiler_warnings.supp:
  Suppress all 'safe' warnings, as detected by win64
win/README:
  Fixed typo

1 files changed, 15 insertions, 15 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 33836837d53..c105a69e861 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -409,24 +409,24 @@ sub main () {
     {
       next if $test->{skip};
 
-      $need_ndbcluster||= $test->{ndb_test};
-      $need_im||= $test->{component_id} eq 'im';
-
-      # Count max number of slaves used by a test case
-      if ( $test->{slave_num} > $max_slave_num)
+      if (!$opt_extern)
       {
-	$max_slave_num= $test->{slave_num};
-	mtr_error("Too many slaves") if $max_slave_num > 3;
-      }
+	$need_ndbcluster||= $test->{ndb_test};
+	$need_im||= $test->{component_id} eq 'im';
 
-      # Count max number of masters used by a test case
-      if ( $test->{master_num} > $max_master_num)
-      {
-	$max_master_num= $test->{master_num};
-	mtr_error("Too many masters") if $max_master_num > 2;
-	mtr_error("Too few masters") if $max_master_num < 1;
-      }
+	# Count max number of slaves used by a test case
+	if ( $test->{slave_num} > $max_slave_num) {
+	  $max_slave_num= $test->{slave_num};
+	  mtr_error("Too many slaves") if $max_slave_num > 3;
+	}
 
+	# Count max number of masters used by a test case
+	if ( $test->{master_num} > $max_master_num) {
+	  $max_master_num= $test->{master_num};
+	  mtr_error("Too many masters") if $max_master_num > 2;
+	  mtr_error("Too few masters") if $max_master_num < 1;
+	}
+      }
       $use_innodb||= $test->{'innodb_test'};
     }