Merged revisions 88539 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 5 Nov 2007 16:30:51 +0000 (16:30 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 5 Nov 2007 16:30:51 +0000 (16:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88539 | tilghman | 2007-11-05 10:20:13 -0600 (Mon, 05 Nov 2007) | 4 lines

Don't check used pooled connections for connection status, as it will cause issues for prepared queries.
Reported by: Nick Gorham (via -dev list)
Patch by: tilghman

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88540 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_odbc.c

index 30b0843..6475e33 100644 (file)
@@ -379,7 +379,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c
                                ast_cli(a->fd, "  Pooled: Yes\n  Limit:  %d\n  Connections in use: %d\n", class->limit, class->count);
 
                                AST_LIST_TRAVERSE(&(class->odbc_obj), current, list) {
-                                       ast_cli(a->fd, "    - Connection %d: %s\n", ++count, current->up && ast_odbc_sanity_check(current) ? "Connected" : "Disconnected");
+                                       ast_cli(a->fd, "    - Connection %d: %s\n", ++count, current->used ? "in use" : current->up && ast_odbc_sanity_check(current) ? "connected" : "disconnected");
                                }
                        } else {
                                /* Should only ever be one of these */