From: teodor <teodor>
Date: Fri, 27 Oct 2006 11:22:08 +0000 (+0000)
Subject: remove FLG_SQL flag, use sqlMode instead
X-Git-Url: http://sigaev.ru/git/gitweb.cgi?p=ftsbench.git;a=commitdiff_plain;h=dbe1334a8cfbc0e7e82de8410da4b67b6cf7b7bd

remove FLG_SQL flag, use sqlMode instead
---

diff --git a/ftsbench.c b/ftsbench.c
index 0232353..69cb79d 100644
--- a/ftsbench.c
+++ b/ftsbench.c
@@ -276,7 +276,7 @@ void
 report(const char *format, ...) {
 	va_list args;
 
-	if (benchFlags & FLG_SQL)
+	if (sqlMode)
 		return;
 
 	va_start(args, format);
@@ -334,10 +334,9 @@ main(int argn, char *argv[]) {
 	if ( dbname == NULL || n<0 || (initMode == 0 && nClients<1) ) 
 		usage();
 
-	if ( sqlMode ) {
+	if ( sqlMode ) 
 		quiet = 1;
-		flags |= FLG_SQL;
-	} else
+	else
 		rowMode = 0;
 
 	benchFlags = flags;
diff --git a/ftsbench.h b/ftsbench.h
index ee3ae76..b72b154 100644
--- a/ftsbench.h
+++ b/ftsbench.h
@@ -87,6 +87,4 @@ ftsDB* MYInit(char * connstr);
 #define	FLG_AND		(0x00000008)
 #define	FLG_OR		(0x00000010)
 
-#define	FLG_SQL		(0x00000020)
-
 #endif
diff --git a/mysqldriver.c b/mysqldriver.c
index 0fddf61..6e0bab9 100644
--- a/mysqldriver.c
+++ b/mysqldriver.c
@@ -151,7 +151,7 @@ startCreateScheme(ftsDB *adb, int flags) {
 	if ( flags & FLG_FUNC )
 		report("Flag 'func' is ignored by MySQL\n");
 
-	if ( (flags & (FLG_GIN | FLG_GIST)) && (db->flags & FLG_SQL) == 0 )
+	if ( flags & (FLG_GIN | FLG_GIST) )
 		report("MySQL doesn't distinguish 'gin' and 'gist' flags\n");
 
 	if ( mysql_query(db->conn, "DROP TABLE IF EXISTS ftsbench CASCADE;")!= 0 ) {