diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /storage/spider/spd_param.h | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'storage/spider/spd_param.h')
| -rw-r--r-- | storage/spider/spd_param.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/spider/spd_param.h b/storage/spider/spd_param.h index 4c26e66c..84f0f118 100644 --- a/storage/spider/spd_param.h +++ b/storage/spider/spd_param.h @@ -316,7 +316,6 @@ my_bool spider_param_index_hint_pushdown( ); uint spider_param_max_connections(); uint spider_param_conn_wait_timeout(); -uint spider_param_internal_lock_wait_timeout(); uint spider_param_log_result_errors(); uint spider_param_log_result_error_with_sql(); uint spider_param_internal_xa_id_type( @@ -368,3 +367,5 @@ int spider_param_strict_group_by( ); bool spider_param_direct_aggregate(THD *thd); bool spider_param_disable_group_by_handler(THD *thd); +bool spider_param_suppress_comment_ignored_warning(THD *thd); +bool spider_param_ignore_comments(THD *thd); |