Bug#32815725 PB2: NDB.NDB_RESTORE_CONV_NULL IS FAILING IN DEVBLD RUNS FOR 8.0 AND TRUNK [2/2]

Fix test case ndb.ndb_restore_conv_null.  Now ndb_restore fails with
existatus 1.

Change-Id: I8bb6a27a94141486b8752f0434f26e20beaccdcf

Author: zmur

mysql-test/suite/ndb/r/ndb_restore_conv_null.result

@@ -67,9 +67,11 @@ col2 varchar(20),
 col3 text,
 col4 date) engine=ndb;
 Cause backup stall
+
 Starting backup
 Backup started
 update nullable set col2=NULL;
+
 Waiting for backup to complete
 Backup completed
 drop table nullable;

mysql-test/suite/ndb/t/ndb_restore_conv_null.test

@@ -69,23 +69,23 @@ create table not_nullable_no_nulls (
 
 --echo # cannot restore nullable->non-nullable without --lossy-conversions
 --error 1
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 --echo # can restore nullable->non-nullable if non-nullable col has no NULL values
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
---exec $NDB_RESTORE -b $the_backup_id -n 2 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
+--exec $NDB_RESTORE -b $the_backup_id -n 2 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 --echo # cannot restore nullable->non-nullable if non-nullable col has NULL values
---error 139
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_with_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--error 1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable_with_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 --echo # cannot restore not-null->non-nullable without --promote-attributes
 --error 1
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.not_nullable_no_nulls $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.not_nullable_no_nulls $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 --echo # can restore not-null->nullable
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.not_nullable_no_nulls --promote-attributes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
---exec $NDB_RESTORE -b $the_backup_id -n 2 -r --include-tables=test.not_nullable_no_nulls --promote-attributes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.not_nullable_no_nulls --promote-attributes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
+--exec $NDB_RESTORE -b $the_backup_id -n 2 -r --include-tables=test.not_nullable_no_nulls --promote-attributes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 select count(*) from nullable_no_nulls where col2=REPEAT("abcde", 4) and col3=REPEAT("XYZ", 2000) and col4="2021-04-01";
 select count(*) from nullable_with_nulls;
@@ -114,13 +114,13 @@ while ($i)
 --enable_query_log
 
 --echo Cause backup stall
---exec $NDB_MGM --ndb-connectstring="$NDB_CONNECTSTRING" -e "all error 10039" >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_MGM -e "all error 10039"
 
 --source suite/ndb/t/ndb_backup_nowait_start.inc
 
 update nullable set col2=NULL;
 
---exec $NDB_MGM --ndb-connectstring="$NDB_CONNECTSTRING" -e "all error 0" >> $NDB_TOOLS_OUTPUT 2&>1
+--exec $NDB_MGM -e "all error 0"
 --source suite/ndb/t/ndb_backup_nowait_wait.inc
 
 drop table nullable;
@@ -134,8 +134,8 @@ create table nullable (
   col4 date not null)engine=ndb;
 
 --echo # cannot restore nullable->non-nullable if backup log sets NULL values
---error 139
---exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2&>1
+--error 1
+--exec $NDB_RESTORE -b $the_backup_id -n 1 -r --include-tables=test.nullable --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 select * from nullable;