Fix array dimensions due to adding Ingres to certain sql arrays.

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index 18c0ac968f31a0acd998334df719aa87617c8d8f..c930e6369d329423c794a53f6f5a44b088a203bc 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -612,7 +612,7 @@ const char *select_recent_version[4] = {
 /* ====== ua_prune.c */
 
 /* List of SQL commands to create temp table and indicies  */
-const char *create_deltabs[4] = {
+const char *create_deltabs[5] = {
    /* MySQL */
    "CREATE TEMPORARY TABLE DelCandidates ("
    "JobId INTEGER UNSIGNED NOT NULL, "
@@ -692,7 +692,7 @@ const char *uar_file[4] = {
    "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId "
    "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20"};
 
-const char *uar_create_temp[4] = {
+const char *uar_create_temp[5] = {
    /* Mysql */
    "CREATE TEMPORARY TABLE temp ("
    "JobId INTEGER UNSIGNED NOT NULL,"
@@ -761,7 +761,7 @@ const char *uar_create_temp[4] = {
    "ON COMMIT PRESERVE ROWS WITH NORECOVERY"
    };
 
-const char *uar_create_temp1[4] = {
+const char *uar_create_temp1[5] = {
    /* Mysql */
    "CREATE TEMPORARY TABLE temp1 ("
    "JobId INTEGER UNSIGNED NOT NULL,"

diff --git a/bacula/src/cats/sql_cmds.h b/bacula/src/cats/sql_cmds.h
index 10cf606f2815564417a31e72fd8db6f8ac11f209..e72bd36c7a6a64ddab090bc23a7737ad3d1f0866 100644 (file)
--- a/bacula/src/cats/sql_cmds.h
+++ b/bacula/src/cats/sql_cmds.h
@@ -75,11 +75,11 @@ extern const char CATS_IMP_EXP *uar_sel_jobid_temp;
 
 extern const char CATS_IMP_EXP *select_recent_version[4];
 extern const char CATS_IMP_EXP *select_recent_version_with_basejob[4];
-extern const char CATS_IMP_EXP *create_deltabs[4];
+extern const char CATS_IMP_EXP *create_deltabs[5];
 
 extern const char CATS_IMP_EXP *uar_file[4];
-extern const char CATS_IMP_EXP *uar_create_temp[4];
-extern const char CATS_IMP_EXP *uar_create_temp1[4];
+extern const char CATS_IMP_EXP *uar_create_temp[5];
+extern const char CATS_IMP_EXP *uar_create_temp1[5];
 extern const char CATS_IMP_EXP *uar_jobid_fileindex_from_dir[4];
 extern const char CATS_IMP_EXP *sql_get_max_connections[4];
 extern const uint32_t CATS_IMP_EXP sql_get_max_connections_index[4];

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 510358ffe0de4a529c7c729b0f72f0a17b8fbc59..0eb2fbc5f0ef9aef21167d353be15bf786ad471f 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -1091,7 +1091,7 @@ bool db_write_batch_file_records(JCR *jcr)
 
 
 /* List of SQL commands to create temp table and indicies  */
-const char *create_temp_basefile[4] = {
+const char *create_temp_basefile[5] = {
    /* MySQL */
    "CREATE TEMPORARY TABLE basefile%lld ("
 //   "CREATE TABLE basefile%lld ("