Commit 13710e86 authored by unknown's avatar unknown
Browse files

change file name to avoid conflict 

    corrected mistake in previous patch


ndb/tools/Makefile.am:
  change file name to avoid conflict
ndb/tools/restore/restore_main.cpp:
  corrected mistake in previous patch
parent ebe7fe14

ndb/tools/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ndb_select_all_SOURCES = select_all.cpp \ 
                         ../test/src/NDBT_ResultRow.cpp \

                         $(tools_common_sources)

ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)

ndb_restore_SOURCES = restore/main.cpp \

ndb_restore_SOURCES = restore/restore_main.cpp \

                      restore/consumer.cpp \

                      restore/consumer_restore.cpp \

                      restore/consumer_printer.cpp \

ndb/tools/restore/main.cpp→ndb/tools/restore/restore_main.cpp

+4 −2
Original line number Diff line number Diff line
@@ -123,15 +123,17 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case 'n':

    if (ga_nodeId == 0)

    {

      printf("Error in --nodeid|-n setting, see --help\n");

      printf("Error in --nodeid,-n setting, see --help\n");

      exit(1);

    }

    break;

  case 'b':

    if (ga_backupId == 0)

    {

      printf("Error in --backupid|-b setting, see --help\n");

      printf("Error in --backupid,-b setting, see --help\n");

      exit(1);

    }

    break;

  case '?':

    usage();

    exit(0);