Skip to content

M
MariaDB
Commit 4692094d authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

Fix reldef.cpp (wrong flag for catalog columns)

parent 81767545
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
storage/connect/reldef.cpp
View file @ 4692094d
...@@ -324,11 +324,11 @@ RECFM TABDEF::GetTableFormat(const char* type) ...@@ -324,11 +324,11 @@ RECFM TABDEF::GetTableFormat(const char* type)
{ {
RECFM recfm = Recfm; 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 // Default format depends on the table type
TABTYPE tc = (Catfunc == FNC_NO) ? GetTypeID(type) : TAB_PRX; switch (GetTypeID(type)) {
switch (tc) {
case TAB_DOS: recfm = RECFM_VAR; break; case TAB_DOS: recfm = RECFM_VAR; break;
case TAB_CSV: recfm = RECFM_CSV; break; case TAB_CSV: recfm = RECFM_CSV; break;
case TAB_FMT: recfm = RECFM_FMT; break; case TAB_FMT: recfm = RECFM_FMT; break;
...@@ -341,8 +341,6 @@ RECFM TABDEF::GetTableFormat(const char* type) ...@@ -341,8 +341,6 @@ RECFM TABDEF::GetTableFormat(const char* type)
default: recfm = RECFM_NAF; break; default: recfm = RECFM_NAF; break;
} // endswitch type } // endswitch type
} // endif recfm
return recfm; return recfm;
} // end of GetTableFormat } // end of GetTableFormat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7