From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 11 May 2020 15:13:18 +0000 (+0200)
Subject: BEE Backport bacula/src/cats/sql_cmds.h
X-Git-Tag: Release-11.3.2~1709
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09a642b4049bc74444a9edd134da9be2d6bd8a94;p=thirdparty%2Fbacula.git

BEE Backport bacula/src/cats/sql_cmds.h

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu May 16 10:40:49 2019 +0200

    Fix #5053 about BVFS commands not compatible with ACLs wildcards

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Tue Feb 13 14:15:04 2018 +0100

    Add MaxPoolBytes support for SQL functions
---

diff --git a/bacula/src/cats/sql_cmds.h b/bacula/src/cats/sql_cmds.h
index 2b574d0e27..3b54df11ae 100644
--- a/bacula/src/cats/sql_cmds.h
+++ b/bacula/src/cats/sql_cmds.h
@@ -89,6 +89,7 @@ extern const char CATS_IMP_EXP *update_counter_values[];
 extern const char CATS_IMP_EXP *expires_in[];
 extern const char CATS_IMP_EXP *prune_cache[];
 extern const char CATS_IMP_EXP *strip_restore[];
+extern const char CATS_IMP_EXP *poolbytes[];
 extern const char CATS_IMP_EXP *count_all_jobs;
 extern const char CATS_IMP_EXP *count_success_jobs;
 extern const char CATS_IMP_EXP *count_success_jobids;
@@ -108,3 +109,4 @@ extern const char CATS_IMP_EXP *count_used_volumes;
 extern const char CATS_IMP_EXP *sum_volumes_bytes;
 extern const char CATS_IMP_EXP *get_volume_size;
 extern const char CATS_IMP_EXP *escape_char_value[];
+extern const char CATS_IMP_EXP *regexp_value[];