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
This commit is contained in:
commit
b13046b391
@ -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));
|
||||
|
Loading…
x
Reference in New Issue
Block a user