diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2019-12-04 15:20:04 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2019-12-04 15:20:04 +0100 |
| commit | 4692094de70031de1efbb2a354a41694f7fbbd90 (patch) | |
| tree | 27aaa3519254cfe04fcefebba0a1e1a186252db0 /storage/connect | |
| parent | 817675459ace163a4cbffa7eeab06670f2942da3 (diff) | |
| download | mariadb-git-4692094de70031de1efbb2a354a41694f7fbbd90.tar.gz | |
Fix reldef.cpp (wrong flag for catalog columns)
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/reldef.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp index ebbd4d76029..2d3c6a6aacd 100644 --- a/storage/connect/reldef.cpp +++ b/storage/connect/reldef.cpp @@ -324,11 +324,11 @@ RECFM TABDEF::GetTableFormat(const char* type) { RECFM recfm = Recfm; - if (recfm == RECFM_DFLT) { + if (Catfunc != FNC_NO) + recfm = RECFM_NAF; + else if (recfm == RECFM_DFLT) // Default format depends on the table type - TABTYPE tc = (Catfunc == FNC_NO) ? GetTypeID(type) : TAB_PRX; - - switch (tc) { + switch (GetTypeID(type)) { case TAB_DOS: recfm = RECFM_VAR; break; case TAB_CSV: recfm = RECFM_CSV; break; case TAB_FMT: recfm = RECFM_FMT; break; @@ -341,8 +341,6 @@ RECFM TABDEF::GetTableFormat(const char* type) default: recfm = RECFM_NAF; break; } // endswitch type - } // endif recfm - return recfm; } // end of GetTableFormat |