After merge fixes

.bzrignore

@@ -1286,3 +1286,5 @@ vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
 BitKeeper/etc/RESYNC_TREE
+mysql-test/r/*.log
+scripts/mysql_upgrade_shell

include/my_handler.h

@@ -18,7 +18,6 @@
 #ifndef _my_handler_h
 #define _my_handler_h
 
-#include "my_global.h"
 #include "my_base.h"
 #include "m_ctype.h"
 #include "myisampack.h"

mysql-test/r/key.result

@@ -341,8 +341,8 @@ i2	int(11)	NO	UNI
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i1` int(11) NOT NULL default '0',
-  `i2` int(11) NOT NULL default '0',
+  `i1` int(11) NOT NULL,
+  `i2` int(11) NOT NULL,
   UNIQUE KEY `i1idx` (`i1`),
   UNIQUE KEY `i2idx` (`i2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1

sql/ha_ndbcluster.cc

@@ -6476,7 +6476,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
                    ("Table: %s  commit_count: %s  rows: %s",
                     share->table_name,
                     llstr(stat.commit_count, buff),
-                    llstr(stat.row_count, buff2));
+                    llstr(stat.row_count, buff2)));
       }
       else
       {