database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Bug#17280 mysqltest, --echo sometimes does not expand $variables

Browse Source 
- Evaluate all variables in the text before printing it to result file


client/mysqltest.c:
  Update echo command to vvaluate all variables in the string before printing, allow
  for variable names to be escaped using \
mysql-test/r/mysqltest.result:
  Update results for echo
mysql-test/t/mysqltest.test:
  Add more advanced tests for echo of strings with several variables 
  and/or text plus variables. Also test that variables can be escaped
This commit is contained in:
unknown
2006-02-10 12:11:16 +01:00
parent f220f89212
commit 3f25e323c5
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/mysqltest.c
View File

@@ -1384,38 +1384,40 @@ int do_system(struct st_query *q)
/*
Print the content between echo and <delimiter> to result file.
If content is a variable, the variable value will be retrieved
Evaluate all variables in the string before printing, allow
for variable names to be escaped using \
SYNOPSIS
do_echo()
q called command
DESCRIPTION
Usage 1:
echo text
Print the text after echo until end of command to result file
Usage 2:
echo $<var_name>
Print the content of the variable <var_name> to result file
echo Some text $<var_name>
Print "Some text" plus the content of the variable <var_name> to
result file
echo Some text \$<var_name>
Print "Some text" plus $<var_name> to result file
*/
int do_echo(struct st_query *q)
int do_echo(struct st_query *command)
{
char *p= q->first_argument;
DYNAMIC_STRING *ds;
VAR v;
var_init(&v,0,0,0,0);
DYNAMIC_STRING *ds, ds_echo;
ds= &ds_res;
eval_expr(&v, p, 0); /* NULL terminated */
if (v.str_val_len)
dynstr_append_mem(ds, v.str_val, v.str_val_len);
init_dynamic_string(&ds_echo, "", 256, 256);
do_eval(&ds_echo, command->first_argument);
dynstr_append_mem(ds, ds_echo.str, ds_echo.length);
dynstr_append_mem(ds, "\n", 1);
var_free(&v);
q->last_argument= q->end;
dynstr_free(&ds_echo);
command->last_argument= command->end;
return 0;
}