Changeset: df5442924469 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df5442924469 Modified Files: Branch: Oct2010 Log Message:
merging diffs (132 lines): diff -r 2a66752740e2 -r df5442924469 buildtools/conf/mock/fedora-14-i386-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/buildtools/conf/mock/fedora-14-i386-monetdb.cfg Wed Oct 06 16:26:38 2010 +0200 @@ -0,0 +1,47 @@ +config_opts['root'] = 'fedora-14-i386' +config_opts['target_arch'] = 'i686' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/i386/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/14/i386/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* +""" + + + diff -r 2a66752740e2 -r df5442924469 buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg Wed Oct 06 16:26:38 2010 +0200 @@ -0,0 +1,51 @@ +config_opts['root'] = 'fedora-14-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/x86_64/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/14/x86_64/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* +""" + + + diff -r 2a66752740e2 -r df5442924469 sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/All Wed Oct 06 16:26:16 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/All Wed Oct 06 16:26:38 2010 +0200 @@ -50,6 +50,7 @@ assert_on_type_mismatch.Bug-2319 crash_on_in_1.Bug-2352 crash_on_complex_join_exp.Bug-2353 +times-crash.Bug-2586 crash_in_dce.Bug-2651 in_query_missing_columns.Bug-2652 sum_on_date_crash.Bug-2643 diff -r 2a66752740e2 -r df5442924469 sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.sql Wed Oct 06 16:26:38 2010 +0200 @@ -0,0 +1,1 @@ +select times(); diff -r 2a66752740e2 -r df5442924469 sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.err --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.err Wed Oct 06 16:26:38 2010 +0200 @@ -0,0 +1,1 @@ +To be approved when the server stops crashing. diff -r 2a66752740e2 -r df5442924469 sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/times-crash.Bug-2586.stable.out Wed Oct 06 16:26:38 2010 +0200 @@ -0,0 +1,1 @@ +To be approved when the server stops crashing. _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
