Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria

storage/maria/ma_test_recovery

@@ -137,7 +137,7 @@ do
   for test_undo in 1 2 3 4
   do
   # first iteration tests rollback of insert, second tests rollback of delete
-  set -- "ma_test1 $silent -M -T -c -N $blobs -H1" "--testflag=1" "--testflag=2 --test-undo=" "ma_test1 $silent -M -T -c -N $blobs -H2" "--testflag=3" "--testflag=4 --test-undo=" "ma_test1 $silent -M -T -c -N $blobs -H2 " "--testflag=2" "--testflag=3 --test-undo=" "ma_test2 $silent -L -K -W -P -M -T -c $blobs -H1" "-t1" "-t2 -A" "ma_test2 $silent -L -K -W -P -M -T -c $blobs -H1" "-t1" "-t6 -A"
+  set -- "ma_test1 $silent -M -T -c -N $blobs -H1" "--testflag=1" "--testflag=2 --test-undo=" "ma_test1 $silent -M -T -c -N $blobs -H2" "--testflag=3" "--testflag=4 --test-undo=" "ma_test1 $silent -M -T -c -N $blobs -H2" "--testflag=2" "--testflag=3 --test-undo=" "ma_test2 $silent -L -K -W -P -M -T -c $blobs -H1" "-t1" "-t2 -A" "ma_test2 $silent -L -K -W -P -M -T -c $blobs -H1" "-t1" "-t6 -A"
   # -N (create NULL fields) is needed because --test-undo adds it anyway
   while [ $# != 0 ]
     do

storage/maria/ma_test_recovery.expected

@@ -731,9 +731,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=3 --test-undo=1 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=3 --test-undo=1 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -818,9 +818,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=3 --test-undo=2 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=3 --test-undo=2 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -905,9 +905,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=3 --test-undo=3 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=3 --test-undo=3 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -992,9 +992,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N  -H2  --testflag=3 --test-undo=4 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N  -H2 --testflag=3 --test-undo=4 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -1079,9 +1079,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=3 --test-undo=1 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=3 --test-undo=1 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -1166,9 +1166,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=3 --test-undo=2 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=3 --test-undo=2 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -1253,9 +1253,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=3 --test-undo=3 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=3 --test-undo=3 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log
@@ -1340,9 +1340,9 @@ testing idempotency
 applying log
 testing applying of CLRs to recreate table
 applying log
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=2 (commit at end)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=2 (commit at end)
 Terminating after inserts
-TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2  --testflag=3 --test-undo=4 (additional aborted work)
+TEST WITH ma_test1 -s -M -T -c -N -b32768 -H2 --testflag=3 --test-undo=4 (additional aborted work)
 Terminating after updates
 Dying on request without maria_commit()/maria_close()
 applying log