ODBC-261 direct execution could be used for old servers

lawrinn · lawrinn · commit 18ee34b7a01d · 2019-07-25T00:23:16.000+02:00
diff --git a/ma_statement.c b/ma_statement.c
@@ -310,7 +310,7 @@ BOOL MADB_CheckIfExecDirectPossible(MADB_Stmt *Stmt)
 }
 /* }}} */
 
-/* {{{ MADB_CheckIfExecDirectPossible
+/* {{{ MADB_BulkInsertPossible
        Checking if we can deploy mariadb_stmt_execute_direct */
 BOOL MADB_BulkInsertPossible(MADB_Stmt *Stmt)
 {
@@ -1206,7 +1206,7 @@ SQLRETURN MADB_StmtExecute(MADB_Stmt *Stmt, BOOL ExecDirect)
           Stmt->RebindParams= FALSE;
         }
 
-        ret= MADB_DoExecute(Stmt, ExecDirect);
+        ret= MADB_DoExecute(Stmt, ExecDirect && MADB_CheckIfExecDirectPossible(Stmt));
 
         if (!SQL_SUCCEEDED(ret))
         {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ BOOL MADB_CheckIfExecDirectPossible(MADB_Stmt *Stmt)`
`310`	`310`	`}`
`311`	`311`	`/* }}} */`
`312`	`312`
`313`		`-/* {{{ MADB_CheckIfExecDirectPossible`
	`313`	`+/* {{{ MADB_BulkInsertPossible`
`314`	`314`	`Checking if we can deploy mariadb_stmt_execute_direct */`
`315`	`315`	`BOOL MADB_BulkInsertPossible(MADB_Stmt *Stmt)`
`316`	`316`	`{`
`@@ -1206,7 +1206,7 @@ SQLRETURN MADB_StmtExecute(MADB_Stmt *Stmt, BOOL ExecDirect)`
`1206`	`1206`	`Stmt->RebindParams= FALSE;`
`1207`	`1207`	`}`
`1208`	`1208`
`1209`		`- ret= MADB_DoExecute(Stmt, ExecDirect);`
	`1209`	`+ ret= MADB_DoExecute(Stmt, ExecDirect && MADB_CheckIfExecDirectPossible(Stmt));`
`1210`	`1210`
`1211`	`1211`	`if (!SQL_SUCCEEDED(ret))`
`1212`	`1212`	`{`