Merge branch '2.1-oracle-compat' into develop-new-merge-oracle

2017-06-28 22:30:16 +02:00
parent 14bb6cf99b 7f1a949198
commit 6cd6ded3d8
88 changed files with 15138 additions and 745 deletions
--- a/query_classifier/qc_sqlite/builtin_functions.h
+++ b/query_classifier/qc_sqlite/builtin_functions.h
@ -22,7 +22,9 @@ extern "C" {
 void init_builtin_functions();
 void finish_builtin_functions();

-bool is_builtin_readonly_function(const char* zToken, uint32_t major, uint32_t minor, uint32_t patch);
+bool is_builtin_readonly_function(const char* zToken,
+                                  uint32_t major, uint32_t minor, uint32_t patch,
+                                  bool check_oracle);

 #ifdef __cplusplus
 }