8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 02:43:03 +01:00

Backport fix for CORE-1064 - Wrong backup order for character sets and collations

This commit is contained in:
asfernandes 2006-12-27 00:11:27 +00:00
parent 1b6650cb6e
commit 1955e81819

View File

@ -339,6 +339,18 @@ int BACKUP_backup(const TEXT* dbb_file, const TEXT* file_name)
write_shadow_files();
}
if (tdgbl->BCK_capabilities & BCK_ods8)
{
// Write Character Sets
BURP_verbose(msgVerbose_write_charsets, NULL, NULL, NULL, NULL, NULL);
write_character_sets();
// Write Collations
BURP_verbose(msgVerbose_write_collations, NULL, NULL, NULL, NULL,
NULL);
write_collations();
}
// Write relations
BURP_verbose(154, NULL, NULL, NULL, NULL, NULL);
@ -381,16 +393,6 @@ int BACKUP_backup(const TEXT* dbb_file, const TEXT* file_name)
BURP_verbose(197, NULL, NULL, NULL, NULL, NULL);
// msg 197 writing exceptions
write_exceptions();
// Write Character Sets
BURP_verbose(msgVerbose_write_charsets, NULL, NULL, NULL, NULL, NULL);
write_character_sets();
// Write Collations
BURP_verbose(msgVerbose_write_collations, NULL, NULL, NULL, NULL,
NULL);
write_collations();
}
// Now go back and write all data