bk commit into 5.1 tree (gni:1.2660) BUG#33801

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni.  When gni does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-24 15:06:49+08:00, gni@stripped +1 -0
  BUG#33801 ndb_restore on non-restored table fails

  storage/ndb/tools/restore/restore_main.cpp@stripped, 2008-01-24 15:06:46+08:00, gni@stripped +2 -1
    Add the check if the table is restored

diff -Nrup a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
--- a/storage/ndb/tools/restore/restore_main.cpp	2007-08-30 16:17:24 +08:00
+++ b/storage/ndb/tools/restore/restore_main.cpp	2008-01-24 15:06:46 +08:00
@@ -822,7 +822,8 @@ main(int argc, char** argv)
     {
       if (!ga_skip_table_check){
         for(i=0; i < metaData.getNoOfTables(); i++){
-          if (checkSysTable(metaData, i))
+          if (checkSysTable(metaData, i) && 
+             checkDbAndTableName(metaData[i]))
           {
             for(Uint32 j= 0; j < g_consumers.size(); j++)
               if (!g_consumers[j]->table_equal(* metaData[i]))