Tag: cws_src680_dba24d User: oj Date: 2007-11-28 12:18:10+0000 Modified: dba/connectivity/source/parse/sqlbison.y
Log: #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.59&r2=1.59.2.1 Delta lines: +5 -4 ------------------- --- sqlbison.y 2007-11-01 14:52:06+0000 1.59 +++ sqlbison.y 2007-11-28 12:18:08+0000 1.59.2.1 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.59 2007/11/01 14:52:06 hr Exp $ +// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.59.2.1 2007/11/28 12:18:08 oj Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: hr $ $Date: 2007/11/01 14:52:06 $ $Revision: 1.59 $ +// $Author: oj $ $Date: 2007/11/28 12:18:08 $ $Revision: 1.59.2.1 $ // // Description: // @@ -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]
