From: Sean Bright <sean@malleable.com>
Date: Tue, 8 Jun 2010 15:45:57 +0000 (+0000)
Subject: Merged revisions 269007 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64ca060a28d7d15be20a5ddca288e0b2552f244;p=thirdparty%2Fasterisk.git

Merged revisions 269007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r269007 | seanbright | 2010-06-08 11:39:52 -0400 (Tue, 08 Jun 2010) | 18 lines

  Merged revisions 269006 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r269006 | seanbright | 2010-06-08 11:28:49 -0400 (Tue, 08 Jun 2010) | 11 lines

    Reduce startup time for cdr_tds with large CDR tables.

    Since we are just checking for table existence, add a WHERE clause that will
    return no rows but will raise an error if the table doesn't exist.

    (closes issue #17380)
    Reported by: kkwong
    Patches:
          issue17380-01.patch uploaded by seanbright (license 71)
    Tested by: kkwong
  ........
................


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

diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 408b255a47..1248649ab1 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -359,7 +359,7 @@ static int mssql_connect(void)
 		goto failed;
 	}
 
-	if (execute_and_consume(settings->dbproc, "SELECT 1 FROM [%s]", settings->table)) {
+	if (execute_and_consume(settings->dbproc, "SELECT 1 FROM [%s] WHERE 1 = 0", settings->table)) {
 		ast_log(LOG_ERROR, "Unable to find table '%s'\n", settings->table);
 		goto failed;
 	}