Merge branch 'master' into odbc-3.0

mariadb-corporation · Jan 3, 2019 · 99a8ac0 · 99a8ac0
2 parents 5916978 + 5d5ec8e
commit 99a8ac0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ma_connection.c b/ma_connection.c
@@ -1404,6 +1404,10 @@ SQLRETURN MADB_DbcGetInfo(MADB_Dbc *Dbc, SQLUSMALLINT InfoType, SQLPOINTER InfoV
     break;
   case SQL_ODBC_VER:
     break;
+  case SQL_OUTER_JOINS:
+    SLen= (SQLSMALLINT)MADB_SetString(isWChar ? &Dbc->Charset : NULL, 
+                                     (void *)InfoValuePtr, BUFFER_CHAR_LEN(BufferLength, isWChar), "Y", SQL_NTS, &Dbc->Error);
+    break;
   case SQL_OJ_CAPABILITIES:
     MADB_SET_NUM_VAL(SQLUINTEGER, InfoValuePtr, SQL_OJ_LEFT | SQL_OJ_RIGHT |
                                                 SQL_OJ_NESTED | SQL_OJ_INNER, StringLengthPtr);