Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

Author: zmur

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

@@ -68,20 +68,20 @@ create table not_nullable_no_nulls (
   col4 date)engine=ndb;
 
 --echo # cannot restore nullable->non-nullable without --lossy-conversions
---error 134
---exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--error 1
+--exec $NDB_RESTORE --no-defaults --core-file=0 -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 --no-defaults -b $the_backup_id -n 1 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
 --exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 2 -r --include-tables=test.nullable_no_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
 
 --echo # cannot restore nullable->non-nullable if non-nullable col has NULL values
---error 139
---exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -r --include-tables=test.nullable_with_nulls --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--error 1
+--exec $NDB_RESTORE --no-defaults --core-file=0 -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 134
---exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -r $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--error 1
+--exec $NDB_RESTORE --no-defaults --core-file=0 -b $the_backup_id -n 1 -r $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT 2>&1
 
 --echo # can restore not-null->nullable
 --exec $NDB_RESTORE --no-defaults -b $the_backup_id -n 1 -r --include-tables=test.not_nullable_no_nulls --promote-attributes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
@@ -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 --no-defaults -b $the_backup_id -n 1 -r --include-tables=test.nullable --lossy-conversions $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--error 1
+--exec $NDB_RESTORE --no-defaults --core-file=0 -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;
 

storage/ndb/tools/restore/consumer_restore.cpp

@@ -3765,15 +3765,15 @@ void BackupRestore::tuple_a(restore_callback_t *cb)
     {
       if (errorHandler(cb)) 
 	continue;
-      err << "Cannot get operation: " << cb->connection->getNdbError() << endl;
+      err << "Cannot get operation: " << m_ndb->getNdbError(cb->error_code) << endl;
       exitHandler();
     } // if
 
     if (op->writeTuple() == -1) 
     {
       if (errorHandler(cb))
 	continue;
-      err << "Error defining op: " << cb->connection->getNdbError() << endl;
+      err << "Error defining op: " << m_ndb->getNdbError(cb->error_code) << endl;
       exitHandler();
     } // if
 
@@ -3908,7 +3908,7 @@ void BackupRestore::tuple_a(restore_callback_t *cb)
     {
       if (errorHandler(cb)) 
 	continue;
-      err << "Error defining op: " << cb->connection->getNdbError() << endl;
+      err << "Error defining op: " << m_ndb->getNdbError(cb->error_code) << endl;
       exitHandler();
     }
 
@@ -4497,7 +4497,7 @@ BackupRestore::logEntry_a(restore_callback_t *cb)
   {
     if (errorHandler(cb)) // temp error, retry
       goto retry;
-    err << "Cannot start transaction: " << trans->getNdbError() << endl;
+    err << "Cannot start transaction: " << m_ndb->getNdbError(cb->error_code) << endl;
     exitHandler();
   } // if
 
@@ -4519,7 +4519,7 @@ BackupRestore::logEntry_a(restore_callback_t *cb)
   {
     if (errorHandler(cb)) // temp error, retry
       goto retry;
-    err << "Cannot get operation: " << trans->getNdbError() << endl;
+    err << "Cannot get operation: " << m_ndb->getNdbError(cb->error_code) << endl;
     exitHandler();
   } // if