1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
--- dbdimp.c.orig Thu Mar 22 10:30:12 2007
+++ dbdimp.c Thu Mar 22 10:31:00 2007
@@ -3413,11 +3413,7 @@
if (!imp_sth->result)
{
do_error(sth, JW_ERR_SEQUENCE, "fetch() without execute()"
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
,NULL);
-#else
- );
-#endif
return Nullav;
}
@@ -3577,11 +3573,7 @@
if (mysql_errno(&imp_dbh->mysql))
do_error(sth, mysql_errno(&imp_dbh->mysql),
mysql_error(&imp_dbh->mysql)
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
, mysql_sqlstate(&imp_dbh->mysql));
-#else
- );
-#endif
#if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION
@@ -3909,11 +3901,7 @@
/* Are we asking for a legal value? */
if (what < 0 || what >= AV_ATTRIB_LAST)
do_error(sth, JW_ERR_NOT_IMPLEMENTED, "Not implemented"
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
, NULL);
-#else
- );
-#endif
/* Return cached value, if possible */
else if (cacheit && imp_sth->av_attr[what])
@@ -3923,11 +3911,7 @@
else if (!res)
do_error(sth, JW_ERR_NOT_ACTIVE,
"statement contains no result"
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
,NULL);
-#else
- );
-#endif
/* Do the real work. */
else
{
@@ -4238,11 +4222,7 @@
{
do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM,
"Illegal parameter number"
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
, NULL);
-#else
- );
-#endif
return FALSE;
}
@@ -4265,11 +4245,7 @@
"Binding non-numeric field %d, value %s as a numeric!",
param_num, neatsvpv(value,0));
do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM, err_msg
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
,NULL);
-#else
- );
-#endif
}
}
@@ -4277,11 +4253,7 @@
{
do_error(sth, JW_ERR_NOT_IMPLEMENTED,
"Output parameters not implemented"
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
,NULL);
-#else
- );
-#endif
return FALSE;
}
@@ -4439,11 +4411,7 @@
if (!my_login(h, imp_dbh))
{
do_error(h, mysql_errno(&imp_dbh->mysql), mysql_error(&imp_dbh->mysql)
-#if MYSQL_VERSION_ID >= SQL_STATE_VERSION
, mysql_sqlstate(&imp_dbh->mysql));
-#else
- );
-#endif
memcpy (&imp_dbh->mysql, &save_socket, sizeof(save_socket));
++imp_dbh->stats.auto_reconnects_failed;
return FALSE;
|
