1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fixup

Browse Source 
client/mysqltest.c:
  Fix after merge, do_eval has three args
  Remove extre return in do_block
This commit is contained in:
unknown 2006-02-23 10:35:53 +01:00
parent 897f8eabf5
commit 9b1aa7fa07
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysqltest.c
View File

@ -1438,7 +1438,7 @@ int do_echo(struct st_query *command)
ds= &ds_res; ds= &ds_res;
init_dynamic_string(&ds_echo, "", 256, 256); init_dynamic_string(&ds_echo, "", 256, 256);
do_eval(&ds_echo, command->first_argument); do_eval(&ds_echo, command->first_argument, FALSE);
dynstr_append_mem(ds, ds_echo.str, ds_echo.length); dynstr_append_mem(ds, ds_echo.str, ds_echo.length);
dynstr_append_mem(ds, "\n", 1); dynstr_append_mem(ds, "\n", 1);
dynstr_free(&ds_echo); dynstr_free(&ds_echo);
@ -2468,7 +2468,6 @@ int do_block(enum block_cmd cmd, struct st_query* q)
var_free(&v); var_free(&v);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
return 0;
} }