|
Lines 182-192
Link Here
|
| 182 |
{ |
182 |
{ |
| 183 |
if (me && me->host) { |
183 |
if (me && me->host) { |
| 184 |
HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host); |
184 |
HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host); |
|
|
185 |
#if MYSQL_VERSION_ID>=32200 |
| 186 |
if (!mysql_init(&(me->server))) { |
| 187 |
return NO; |
| 188 |
} |
| 189 |
#endif |
| 190 |
|
| 191 |
#if MYSQL_VERSION_ID>=40103 |
| 192 |
if ((me->psvr = mysql_real_connect(&(me->server), me->host, |
| 193 |
me->user ? me->user : "", |
| 194 |
me->password ? me->password : "", |
| 195 |
"", 0 , 0 , 0)) == NULL) { |
| 196 |
#else |
| 197 |
|
| 185 |
if ((me->psvr = mysql_connect(&(me->server), me->host, |
198 |
if ((me->psvr = mysql_connect(&(me->server), me->host, |
| 186 |
me->user ? me->user : "", |
199 |
me->user ? me->user : "", |
| 187 |
me->password ? me->password : "")) == NULL) { |
200 |
me->password ? me->password : "")) == NULL) { |
| 188 |
HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ |
201 |
#endif |
| 189 |
mysql_error(&me->server) _ mysql_errno(&me->server)); |
202 |
HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ |
|
|
203 |
mysql_error(&me->server) _ mysql_errno(&me->server)); |
| 190 |
return NO; |
204 |
return NO; |
| 191 |
} |
205 |
} |
| 192 |
return YES; |
206 |
return YES; |
|
Lines 230-235
Link Here
|
| 230 |
PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db) |
244 |
PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db) |
| 231 |
{ |
245 |
{ |
| 232 |
BOOL created = NO; |
246 |
BOOL created = NO; |
|
|
247 |
char query[1024]; |
| 233 |
if (me && me->psvr && db) { |
248 |
if (me && me->psvr && db) { |
| 234 |
HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db); |
249 |
HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db); |
| 235 |
me->db = NULL; |
250 |
me->db = NULL; |
|
Lines 240-246
Link Here
|
| 240 |
|
255 |
|
| 241 |
/* If the database couldn't be found then create a new one */ |
256 |
/* If the database couldn't be found then create a new one */ |
| 242 |
if (err == 1049) { |
257 |
if (err == 1049) { |
|
|
258 |
#if MYSQL_VERSION_ID>=40103 |
| 259 |
sprintf (query, "CREATE DATABASE %s", db); |
| 260 |
if (mysql_query(me->psvr, query) != 0) { |
| 261 |
#else |
| 243 |
if (mysql_create_db(me->psvr, db) < 0) { |
262 |
if (mysql_create_db(me->psvr, db) < 0) { |
|
|
263 |
#endif |
| 244 |
HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ |
264 |
HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ |
| 245 |
mysql_error(me->psvr) _ err); |
265 |
mysql_error(me->psvr) _ err); |
| 246 |
return NO; |
266 |
return NO; |
