User: rt Date: 2008-01-30 08:04:28+0000 Modified: dba/connectivity/source/parse/sqlbison.y
Log: INTEGRATION: CWS dba24d (1.59.2); FILE MERGED 2007/12/01 13:36:58 fs 1.59.2.2: RESYNC: (1.59-1.60); FILE MERGED 2007/11/28 12:18:08 oj 1.59.2.1: #i18201# handle reduce reduce conflict for is true File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlbison.y Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.60&r2=1.61 Delta lines: +3 -2 ------------------- --- sqlbison.y 2007-11-21 15:08:54+0000 1.60 +++ sqlbison.y 2008-01-30 08:04:26+0000 1.61 @@ -1037,6 +1037,7 @@ SQL_TOKEN_TRUE | SQL_TOKEN_FALSE | SQL_TOKEN_UNKNOWN + | SQL_TOKEN_NULL ; boolean_primary: predicate @@ -1325,7 +1326,7 @@ ; test_for_null: - row_value_constructor SQL_TOKEN_IS sql_not SQL_TOKEN_NULL + row_value_constructor SQL_TOKEN_IS sql_not truth_value { $$ = SQL_NEW_RULE; $$->append($1); @@ -1333,7 +1334,7 @@ $$->append($3); $$->append($4); } - | SQL_TOKEN_IS sql_not SQL_TOKEN_NULL + | SQL_TOKEN_IS sql_not truth_value { if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
