On Tue, 2009-08-04 at 00:25 +0100, Nick Kew wrote: > Hmmm? That's entirely possible (though the name doesn't look like a > particularly likely candidate for my debug code), but your reference > eludes me. > > From whence is that #define?
r82 in your old repo. You were just changing the licensing text in it: ------------------------------------------------------------------------ r82 | niq | 2007-01-10 01:54:50 +1100 (Wed, 10 Jan 2007) | 3 lines Update Licensing http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/ ------------------------------------------------------------------------ Diff: ------------------------------------------------------------------------ Index: apr_dbd_mysql.c =================================================================== --- apr_dbd_mysql.c (revision 81) +++ apr_dbd_mysql.c (revision 82) @@ -1,19 +1,24 @@ /* - Copyright (c) 2003-6, WebThing Ltd and other contributors + Copyright (c) 2003-7, WebThing Ltd and other contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +(at your option) any later version. Alternatively, where this program +is aggregated with the Apache APR-UTIL package version 1.2 or later, +you can distribute and/or modify it under the terms of the Apache +License 2.0 as published by the Apache Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +applicable License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +You may obtain a copy of the Apache License 2.0 at: +http://www.apache.org/licenses/LICENSE-2.0 */ @@ -24,6 +29,11 @@ * software to be distributed by apache.org, but this should * not be a problem for third-parties who wish to distribute * it alongside the APR and other Apache software. + * + * It is updated to dual license after discussion with Debian + * and taking into account MySQL's FOSS exception. + * http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/ + * http://www.mysql.com/company/legal/licensing/foss-exception.html * * MAINTAINERS * @@ -36,6 +46,7 @@ #include "apu.h" +#define HAVE_MYSQL_MYSQL_H #if APU_HAVE_MYSQL ------------------------------------------------------------------------ -- Bojan
