Fixed unsafe define of uint4korr()

Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups

include/my_global.h

@@ -1078,7 +1078,7 @@ typedef char		bool;	/* Ordinary boolean values 0 1 */
 */
 #define uint3korr(A)	(long) (*((unsigned int *) (A)) & 0xFFFFFF)
 #endif
-#define uint4korr(A)	(*((unsigned long *) (A)))
+#define uint4korr(A)	(*((uint32 *) (A)))
 #define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
 				    (((uint32) ((uchar) (A)[1])) << 8) +\
 				    (((uint32) ((uchar) (A)[2])) << 16) +\

mysql-test/lib/mtr_report.pl

@@ -236,8 +236,10 @@ sub mtr_report_stats ($) {
       "the documentation at\n",
       "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
   }
-  print
-      "The servers were restarted $tot_restarts times\n";
+  if (!$::opt_extern)
+  {
+    print "The servers where restarted $tot_restarts times\n";
+  }
 
   if ( $::opt_timer )
   {

mysql-test/t/ndb_lock.test

@@ -149,7 +149,7 @@ begin;
 # Have to check with pk access here since scans take locks on
 # all rows and then release them in chunks
 select * from t1 where x = 1 for update;
---error 1205
+--error 1105,1205
 select * from t1 where x = 2 for update;
 rollback;
 

sql/sql_prepare.cc

@@ -2203,11 +2203,11 @@ void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
 {
   uchar *packet= (uchar*)packet_arg; // GCC 4.0.1 workaround
   ulong stmt_id= uint4korr(packet);
-  ulong flags= (ulong) ((uchar) packet[4]);
+  ulong flags= (ulong) packet[4];
   /* Query text for binary, general or slow log, if any of them is open */
   String expanded_query;
 #ifndef EMBEDDED_LIBRARY
-  uchar *packet_end= (uchar *) packet + packet_length - 1;
+  uchar *packet_end= packet + packet_length - 1;
 #endif
   Prepared_statement *stmt;
   bool error;