diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-02 09:06:21 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-02 09:06:21 +0200 |
| commit | b13046b391efb617f765118030cbe49c3fe463d9 (patch) | |
| tree | 0c87fdf382b8721935875ff2ca57055ea9b4b7a1 | |
| parent | 5501d5be3ddbe307cddc936f8c57f074856dc946 (diff) | |
| parent | 6f1d478206827b879b0f35253bd4c44dbc4ae8cc (diff) | |
| download | mariadb-git-b13046b391efb617f765118030cbe49c3fe463d9.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
client/mysqltest.c:
Auto merged
| -rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 65f96189ab3..d83b3dda891 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1512,7 +1512,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; @@ -1524,6 +1523,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)); |