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

Fixed bug CORE-5448 : FB3 - crash (consistency check) when creating view on table which has column with character set none, database default charset is utf8, and utf8 default collation is 'unicode'

Browse Source
This commit is contained in:
hvlad 2017-02-02 13:33:31 +02:00
parent 7a83352a1d
commit 1a075b8d5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/dfw.epp
View File

@ -5829,7 +5829,7 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
FLD.RDB$FIELD_SUB_TYPE,
FLD.RDB$CHARACTER_SET_ID, collation))
{
if (REL.RDB$FORMAT.NULL)
if (null_view && REL.RDB$FORMAT.NULL)
DPM_delete_relation(tdbb, relation);
ERR_post(Arg::Gds(isc_no_meta_update) <<
@ -5839,7 +5839,7 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
// Make sure the text type specified is implemented
if (!validate_text_type(tdbb, tfb))
{
if (REL.RDB$FORMAT.NULL)
if (null_view && REL.RDB$FORMAT.NULL)
DPM_delete_relation(tdbb, relation);
ERR_post_nothrow(Arg::Gds(isc_no_meta_update) <<