]>
Commit | Line | Data |
---|---|---|
9fa49beb JB |
1 | --- firebird-1.0.0.796/qli/help.e.orig Thu Aug 3 22:53:52 2000 |
2 | +++ firebird-1.0.0.796/qli/help.e Thu Dec 5 00:21:52 2002 | |
3 | @@ -160,7 +160,7 @@ | |
4 | if (!(l = p - X.TOPIC)) | |
5 | continue; | |
6 | if (++topics == 1 && banner) | |
7 | - ib_printf ("%s\n", banner, string, parent); | |
8 | + ib_printf ("%s\n", banner); | |
9 | p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH; | |
10 | if (p + l > line + RIGHT_MARGIN) | |
11 | { | |
12 | --- firebird-1.0.0.796/porting/qli/help.c.orig Thu Dec 5 00:00:10 2002 | |
13 | +++ firebird-1.0.0.796/porting/qli/help.c Thu Dec 5 00:22:15 2002 | |
14 | @@ -289,7 +289,7 @@ | |
15 | isc_25.isc_26)) | |
16 | continue; | |
17 | if (++topics == 1 && banner) | |
18 | - ib_printf ("%s\n", banner, string, parent); | |
19 | + ib_printf ("%s\n", banner); | |
20 | p = line + ((ptr - line + COLUMN_WIDTH - 1) / COLUMN_WIDTH) * COLUMN_WIDTH; | |
21 | if (p + l > line + RIGHT_MARGIN) | |
22 | { | |
23 | --- firebird-1.0.0.796/jrd/rse.c.orig Fri Mar 1 12:54:03 2002 | |
24 | +++ firebird-1.0.0.796/jrd/rse.c Thu Dec 5 00:48:00 2002 | |
25 | @@ -735,7 +735,7 @@ | |
26 | MOV_get_int64 (EVL_expr (tdbb, (NOD) rsb->rsb_arg [0]), 0); | |
27 | ||
28 | if (((IRSB_FIRST)impure)->irsb_count < 1) | |
29 | - ERR_post (gds__bad_limit_param, 0); | |
30 | + ERR_post (gds__not_valid /*gds__bad_limit_param*/, 0); | |
31 | ||
32 | rsb = rsb->rsb_next; | |
33 | break; | |
34 | @@ -745,7 +745,7 @@ | |
35 | MOV_get_int64 (EVL_expr (tdbb, (NOD) rsb->rsb_arg [0]), 0); | |
36 | ||
37 | if (((IRSB_SKIP)impure)->irsb_count < 0) | |
38 | - ERR_post (gds__bad_skip_param, 0); | |
39 | + ERR_post (gds__not_valid /*gds__bad_skip_param*/, 0); | |
40 | ((IRSB_SKIP)impure)->irsb_count++; | |
41 | ||
42 | rsb = rsb->rsb_next; | |
43 | --- firebird-1.0.0.796/dsql/ddl.c.orig Sat Dec 8 13:57:34 2001 | |
44 | +++ firebird-1.0.0.796/dsql/ddl.c Thu Dec 5 00:52:03 2002 | |
45 | @@ -2885,7 +2885,7 @@ | |
46 | if (!arguments || position > arguments->nod_count || position < 1) | |
47 | ERRD_post (gds__sqlerr, gds_arg_number, (SLONG) -607, | |
48 | gds_arg_gds, gds__dsql_command_err, | |
49 | - gds_arg_gds, isc_dsql_udf_return_pos_err, /*gds__extern_func_err, */ | |
50 | + gds_arg_gds, isc_dsql_function_err /*isc_dsql_udf_return_pos_err*/, /*gds__extern_func_err, */ | |
51 | gds_arg_number, (SLONG) (arguments ? arguments->nod_count : 0), | |
52 | /* CVC: We should devise new msg "position should be between 1 and #params"; | |
53 | here it is: dsql_udf_return_pos_err */ | |
54 | --- firebird-1.0.0.796/dsql/pass1.c.orig Fri Feb 8 13:03:01 2002 | |
55 | +++ firebird-1.0.0.796/dsql/pass1.c Thu Dec 5 00:57:13 2002 | |
56 | @@ -1193,7 +1193,7 @@ | |
57 | if (node) | |
58 | ALLD_release ((FRB) node); | |
59 | ERRD_post (gds__sqlerr, gds_arg_number, (SLONG) -204, | |
60 | - gds_arg_gds, isc_dsql_ambiguous_field_name, | |
61 | + gds_arg_gds, isc_dsql_field_ref /*isc_dsql_ambiguous_field_name*/, | |
62 | gds_arg_string, buffer, | |
63 | gds_arg_string, ++p, | |
64 | gds_arg_gds, gds__random, | |
65 | @@ -1204,7 +1204,7 @@ | |
66 | ||
67 | ||
68 | ERRD_post_warning (isc_sqlwarn, gds_arg_number, (SLONG) 204, | |
69 | - gds_arg_warning, isc_dsql_ambiguous_field_name, | |
70 | + gds_arg_warning, isc_dsql_field_ref /*isc_dsql_ambiguous_field_name*/, | |
71 | gds_arg_string, buffer, | |
72 | gds_arg_string, ++p, | |
73 | gds_arg_gds, gds__random, | |
74 | --- firebird-1.0.0.796/Configure_SetupEnv.sh.orig Tue Aug 7 20:19:19 2001 | |
75 | +++ firebird-1.0.0.796/Configure_SetupEnv.sh Thu Dec 5 08:14:29 2002 | |
76 | @@ -53,6 +53,6 @@ | |
77 | LD_LIBRARY_PATH=$FBNewBuild/lib:$FBBuildRoot/jrd:$LD_LIBRARY_PATH | |
78 | export LD_LIBRARY_PATH | |
79 | ||
80 | -PATH=$PATH:$FBNewBuild/bin:. | |
81 | +PATH=$FBNewBuild/bin:$PATH:. | |
82 | ||
83 |