Commit b13046b3 authored by unknown's avatar unknown

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
parents 5501d5be 6f1d4782
...@@ -1512,7 +1512,6 @@ void var_set_query_get_value(struct st_command *command, VAR *var) ...@@ -1512,7 +1512,6 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
int col_no= -1; int col_no= -1;
MYSQL_RES* res; MYSQL_RES* res;
MYSQL* mysql= &cur_con->mysql; MYSQL* mysql= &cur_con->mysql;
LINT_INIT(res);
static DYNAMIC_STRING ds_query; static DYNAMIC_STRING ds_query;
static DYNAMIC_STRING ds_col; static DYNAMIC_STRING ds_col;
...@@ -1524,6 +1523,7 @@ void var_set_query_get_value(struct st_command *command, VAR *var) ...@@ -1524,6 +1523,7 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
}; };
DBUG_ENTER("var_set_query_get_value"); DBUG_ENTER("var_set_query_get_value");
LINT_INIT(res);
strip_parentheses(command); strip_parentheses(command);
DBUG_PRINT("info", ("query: %s", command->query)); DBUG_PRINT("info", ("query: %s", command->query));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment