Changeset: 091e939109be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=091e939109be Modified Files: Branch: default Log Message:
Merge with Jun2010 branch. diffs (42 lines): diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.sql --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:08:54 2010 +0200 @@ -1,5 +1,5 @@ select city.city_name,state.state_name,city.city_code from city,state where city.city_code='MATL' and city.state_code=state.state_code; -select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code >= 4; +select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code order by city.city_name,state.state_name; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code order by month_name.month_number; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code >= 4 order by month_name.month_number; select flight.flight_code,aircraft.aircraft_type from flight,aircraft where flight.aircraft_code=aircraft.aircraft_code order by flight.flight_code; diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:08:54 2010 +0200 @@ -32,17 +32,18 @@ % city_name, state_name, city_code # name % char, char, char # type % 25, 25, 4 # length +[ "ATLANTA", "GEORGIA", "MATL" ] +[ "BALTIMORE", "MARYLAND", "BBWI" ] +[ "BOSTON", "MASSACHUSETTS", "BBOS" ] +[ "DALLAS", "TEXAS", "DDFW" ] +[ "DENVER", "COLORADO", "DDEN" ] +[ "FORT WORTH", "TEXAS", "FDFW" ] [ "OAKLAND", "CALIFORNIA", "OOAK" ] +[ "PHILADELPHIA", "PENNSYLVANIA", "PPHL" ] +[ "PITTSBURGH", "PENNSYLVANIA", "PPIT" ] [ "SAN FRANCISCO", "CALIFORNIA", "SSFO" ] -[ "DENVER", "COLORADO", "DDEN" ] [ "WASHINGTON", "DISTRICT OF COLUMBIA", "WWAS" ] -[ "ATLANTA", "GEORGIA", "MATL" ] -[ "BOSTON", "MASSACHUSETTS", "BBOS" ] -[ "BALTIMORE", "MARYLAND", "BBWI" ] -[ "PITTSBURGH", "PENNSYLVANIA", "PPIT" ] -[ "PHILADELPHIA", "PENNSYLVANIA", "PPHL" ] -[ "FORT WORTH", "TEXAS", "FDFW" ] -[ "DALLAS", "TEXAS", "DDFW" ] +#select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; % sys.month_name, sys.day_name # table_name % month_name, day_name # name % char, char # type _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
