further reduce diffs to 5.5, monty review

mysql-test/include/mysqld--help.inc

@@ -18,7 +18,7 @@ perl;
   # their paths may vary:
   @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
                log-slow-queries pid-file slow-query-log-file log-basename
-               datadir slave-load-tmpdir tmpdir socket /;
+               datadir slave-load-tmpdir tmpdir socket/;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster feedback debug temp-pool ssl des-key-file

mysql-test/r/kill.result

@@ -60,6 +60,9 @@ SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
 KILL @id;
 SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 Got one of the listed errors
+SELECT 1;
+1
+1
 SET DEBUG_SYNC = 'RESET';
 DROP TABLE t1, t2;
 SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';

mysql-test/r/mysqld--help-win.result

@@ -941,7 +941,7 @@ lower-case-table-names 1
 master-info-file master.info
 master-retry-count 86400
 master-verify-checksum FALSE
-max-allowed-packet 8388608
+max-allowed-packet 1048576
 max-binlog-cache-size 18446744073709547520
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
@@ -952,7 +952,7 @@ max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
 max-length-for-sort-data 1024
-max-long-data-size 8388608
+max-long-data-size 1048576
 max-prepared-stmt-count 16382
 max-relay-log-size 0
 max-seeks-for-key 18446744073709551615

mysql-test/t/flush_read_lock_kill.test

@@ -65,7 +65,7 @@ KILL CONNECTION @id;
 connection con1;
 --echo # Try to reap FLUSH TABLES WITH READ LOCK, 
 --echo # it fail due to killed statement and connection.
---error 1317,2013,1927
+--error 1317,2013
 reap;
 
 --echo # Switching to 'con2'.

mysql-test/t/kill.test

@@ -142,10 +142,9 @@ KILL @id;
 SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 
 connection con1;
---error 1317,1053,2006,2013,1927
+--error 1317,1053,2006,2013
 reap;
---error 0,2013
-let $ignore= `SELECT 1`;
+SELECT 1;
 
 connection default;
 SET DEBUG_SYNC = 'RESET';