diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-14 00:26:03 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-14 00:26:03 +0100 |
| commit | fb1ff4e9f5474d23a7f99aaed83a9701d12dab44 (patch) | |
| tree | 7277fefbebd4ece1be405c20554552963479c318 /storage/connect/tabodbc.cpp | |
| parent | c523370389e5ce9c65dd6b532b44d4d06d1d7762 (diff) | |
| download | mariadb-git-fb1ff4e9f5474d23a7f99aaed83a9701d12dab44.tar.gz | |
Fix a typo that caused CONNECT to crash on ODBC catalog tables
in ODBCDEF::DefineAM line 106
Modified:
tabodbc.cpp
Diffstat (limited to 'storage/connect/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index 876467c9706..c1fad60835f 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -103,7 +103,7 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff) Desc = Connect = Cat->GetStringCatInfo(g, Name, "Connect", ""); Tabname = Cat->GetStringCatInfo(g, Name, "Name", - (Catfunc & (FNC_TABLE || FNC_COL)) ? NULL : Name); + (Catfunc & (FNC_TABLE | FNC_COL)) ? NULL : Name); Tabname = Cat->GetStringCatInfo(g, Name, "Tabname", Tabname); Tabowner = Cat->GetStringCatInfo(g, Name, "Owner", ""); Tabqual = Cat->GetStringCatInfo(g, Name, "Qualifier", ""); |