summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-06-02 09:05:37 +0200
committerunknown <msvensson@pilot.(none)>2007-06-02 09:05:37 +0200
commit6f1d478206827b879b0f35253bd4c44dbc4ae8cc (patch)
tree91d44ffd1760d06618c471a5a83f3db7d5fb3f44 /client
parentc73e0cfb6022945a5b0411b740f51e0f931a9d07 (diff)
parente5822c2c1aae78199f916a05aa45b09647029fbd (diff)
downloadmariadb-git-6f1d478206827b879b0f35253bd4c44dbc4ae8cc.tar.gz
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 665fa9c581e..2d9ee74891c 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1528,7 +1528,6 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
int col_no= -1;
MYSQL_RES* res;
MYSQL* mysql= &cur_con->mysql;
- LINT_INIT(res);
static DYNAMIC_STRING ds_query;
static DYNAMIC_STRING ds_col;
@@ -1540,6 +1539,7 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
};
DBUG_ENTER("var_set_query_get_value");
+ LINT_INIT(res);
strip_parentheses(command);
DBUG_PRINT("info", ("query: %s", command->query));