From 49be74d99dc7bb466aaef19c380966e8e84c9acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 10 Jan 1997 11:52:10 +0100
Subject: [PATCH] Hopefully fixed a couple of bugs.
Rev: src/modules/mysql/mysql.c:1.9
---
src/modules/mysql/mysql.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/mysql/mysql.c b/src/modules/mysql/mysql.c
index faffb4d844..601b50353b 100644
--- a/src/modules/mysql/mysql.c
+++ b/src/modules/mysql/mysql.c
@@ -1,5 +1,5 @@
/*
- * $Id: mysql.c,v 1.8 1997/01/10 00:30:09 grubba Exp $
+ * $Id: mysql.c,v 1.9 1997/01/10 10:52:10 grubba Exp $
*
* SQL database functionality for Pike
*
@@ -59,7 +59,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
* Globals
*/
-RCSID("$Id: mysql.c,v 1.8 1997/01/10 00:30:09 grubba Exp $");
+RCSID("$Id: mysql.c,v 1.9 1997/01/10 10:52:10 grubba Exp $");
struct program *mysql_program = NULL;
@@ -268,7 +268,7 @@ static void f_big_query(INT32 args)
pop_n_elems(args);
if (!(PIKE_MYSQL->last_result = result)) {
- if (mysql_num_fields(socket)) {
+ if (mysql_num_fields(socket) && mysql_error(socket)[0]) {
error("mysql->big_query(): Couldn't create result for query\n");
}
/* query was INSERT or similar - return 0 */
@@ -446,7 +446,7 @@ static void f_list_dbs(INT32 args)
{
MYSQL *socket = PIKE_MYSQL->socket;
MYSQL_RES *result;
- char *wild = "*";
+ char *wild = NULL;
if (args) {
if (sp[-args].type != T_STRING) {
@@ -483,7 +483,7 @@ static void f_list_tables(INT32 args)
{
MYSQL *socket = PIKE_MYSQL->socket;
MYSQL_RES *result;
- char *wild = "*";
+ char *wild = NULL;
if (args) {
if (sp[-args].type != T_STRING) {
@@ -521,7 +521,7 @@ static void f_list_fields(INT32 args)
MYSQL *socket = PIKE_MYSQL->socket;
MYSQL_RES *result;
char *table;
- char *wild = "*";
+ char *wild = NULL;
if (!args) {
error("Too few arguments to mysql->list_fields()\n");
--
GitLab