← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/system_table_ms.cc

  • Committer: Brian Aker
  • Date: 2010-10-31 23:41:31 UTC
  • mfrom: (1892.2.1 lintian-warnings)
  • Revision ID: brian@tangent.org-20101031234131-0y4fjb56c8tm95ra
Merge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/system_table_ms.cc
637
637
                                if (MSHTTPHeaderTable::tableVersion == tab_version)
638
638
                                        MSHTTPHeaderTable::restoreTable(RETAIN(db), data, tab_size);
639
639
                                else
640
 
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "METADATA_HEADER_NAME" failed, incompatable table version" );
 
640
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "METADATA_HEADER_NAME" failed, incompatible table version" );
641
641
                                break;
642
642
                        case MSCloudTable::tableID:
643
643
                                if (MSCloudTable::tableVersion == tab_version)
644
644
                                        MSCloudTable::restoreTable(RETAIN(db), data, tab_size);
645
645
                                else
646
 
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "CLOUD_TABLE_NAME" failed, incompatable table version" );
 
646
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "CLOUD_TABLE_NAME" failed, incompatible table version" );
647
647
                                break;
648
648
                        case MSBackupTable::tableID:
649
649
                                if (MSBackupTable::tableVersion == tab_version)
650
650
                                        MSBackupTable::restoreTable(RETAIN(db), data, tab_size);
651
651
                                else
652
 
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "BACKUP_TABLE_NAME" failed, incompatable table version" );
 
652
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "BACKUP_TABLE_NAME" failed, incompatible table version" );
653
653
                                break;                          
654
654
                        case MSVariableTable::tableID:
655
655
                                if (MSVariableTable::tableVersion == tab_version)
656
656
                                        MSVariableTable::restoreTable(RETAIN(db), data, tab_size);
657
657
                                else
658
 
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "VARIABLES_TABLE_NAME" failed, incompatable table version" );
 
658
                                        CSException::logException(CS_CONTEXT, MS_ERR_SYSTAB_VERSION, "Restore "VARIABLES_TABLE_NAME" failed, incompatible table version" );
659
659
                                break;
660
660
                        default:
661
661
                                ASSERT(false);