← Back to branch summary

~ubuntu-branches/ubuntu/lucid/postgresql-8.4/lucid-proposed

« back to all changes in this revision

Viewing changes to src/backend/utils/fmgr/dfmgr.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-11 16:59:35 UTC
  • mfrom: (5.1.1 karmic)
  • Revision ID: james.westby@ubuntu.com-20090711165935-jfwin6gfrxf0gfsi
Tags: 8.4.0-2
http://bugs.debian.org/536139
* debian/libpq-dev.install: Ship catalog/genbki.h. (Closes: #536139)
* debian/rules: Drop --enable-cassert for final release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/utils/fmgr/dfmgr.c
8
8
 *
9
9
 *
10
10
 * IDENTIFICATION
11
 
 *        $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.98 2009/01/01 17:23:51 momjian Exp $
 
11
 *        $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.99 2009/06/11 14:49:05 momjian Exp $
12
12
 *
13
13
 *-------------------------------------------------------------------------
14
14
 */
73
73
 
74
74
static void *internal_load_library(const char *libname);
75
75
static void incompatible_module_error(const char *libname,
76
 
                                                                        const Pg_magic_struct *module_magic_data);
 
76
                                                  const Pg_magic_struct *module_magic_data);
77
77
static void internal_unload_library(const char *libname);
78
78
static bool file_exists(const char *name);
79
79
static char *expand_dynamic_library_name(const char *name);
301
301
incompatible_module_error(const char *libname,
302
302
                                                  const Pg_magic_struct *module_magic_data)
303
303
{
304
 
        StringInfoData  details;
 
304
        StringInfoData details;
305
305
 
306
306
        /*
307
307
         * If the version doesn't match, just report that, because the rest of the
311
311
                ereport(ERROR,
312
312
                                (errmsg("incompatible library \"%s\": version mismatch",
313
313
                                                libname),
314
 
                                 errdetail("Server is version %d.%d, library is version %d.%d.",
315
 
                                                   magic_data.version / 100,
316
 
                                                   magic_data.version % 100,
317
 
                                                   module_magic_data->version / 100,
318
 
                                                   module_magic_data->version % 100)));
 
314
                          errdetail("Server is version %d.%d, library is version %d.%d.",
 
315
                                                magic_data.version / 100,
 
316
                                                magic_data.version % 100,
 
317
                                                module_magic_data->version / 100,
 
318
                                                module_magic_data->version % 100)));
319
319
 
320
320
        /*
321
321
         * Otherwise, spell out which fields don't agree.
357
357
                if (details.len)
358
358
                        appendStringInfoChar(&details, '\n');
359
359
                appendStringInfo(&details,
360
 
                                                 _("Server has FLOAT4PASSBYVAL = %s, library has %s."),
 
360
                                           _("Server has FLOAT4PASSBYVAL = %s, library has %s."),
361
361
                                                 magic_data.float4byval ? "true" : "false",
362
362
                                                 module_magic_data->float4byval ? "true" : "false");
363
363
        }
366
366
                if (details.len)
367
367
                        appendStringInfoChar(&details, '\n');
368
368
                appendStringInfo(&details,
369
 
                                                 _("Server has FLOAT8PASSBYVAL = %s, library has %s."),
 
369
                                           _("Server has FLOAT8PASSBYVAL = %s, library has %s."),
370
370
                                                 magic_data.float8byval ? "true" : "false",
371
371
                                                 module_magic_data->float8byval ? "true" : "false");
372
372
        }
373
373
 
374
374
        if (details.len == 0)
375
375
                appendStringInfo(&details,
376
 
                                                 _("Magic block has unexpected length or padding difference."));
 
376
                          _("Magic block has unexpected length or padding difference."));
377
377
 
378
378
        ereport(ERROR,
379
379
                        (errmsg("incompatible library \"%s\": magic block mismatch",