[asterisk-commits] tilghman: branch 1.8 r312286 - /branches/1.8/addons/cdr_mysql.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Apr  1 05:44:33 2011
New Revision: 312286

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=312286
Log:
Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.

Modified:
    branches/1.8/addons/cdr_mysql.c

Modified: branches/1.8/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/addons/cdr_mysql.c?view=diff&rev=312286&r1=312285&r2=312286
==============================================================================
--- branches/1.8/addons/cdr_mysql.c (original)
+++ branches/1.8/addons/cdr_mysql.c Fri Apr  1 05:44:33 2011
@@ -428,7 +428,7 @@
 	int res;
 	struct ast_config *cfg;
 	struct ast_variable *var;
-	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+	struct ast_flags config_flags = { 0 };
 	struct column *entry;
 	char *temp;
 	struct ast_str *compat;
@@ -439,6 +439,9 @@
 	my_bool my_bool_true = 1;
 #endif
 
+	/* Cannot use a conditionally different flag, because the table layout may
+	 * have changed, which is not detectable by config file change detection,
+	 * but should still cause the configuration to be re-parsed. */
 	cfg = ast_config_load(config, config_flags);
 	if (!cfg) {
 		ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);