From 2ee21c9c46abb71d1bb1200bb77dada3969d49fb Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 8 Oct 2001 07:24:04 +0300 Subject: Cleanup after last merge client/mysqltest.c: Don't write error message to log if there is more than one possible error message include/mysqld_error.h: Made error messages more general libmysqld/Makefile.am: md5 is now in mysys mysql-test/include/have_isam.inc: Update to new result format mysql-test/include/not_embedded.inc: Update to new result format mysql-test/mysql-test-run.sh: Update to new result format mysql-test/r/auto_increment.result: Update to new result format mysql-test/r/count_distinct2.result: Update to new result format mysql-test/r/create.result: Update to new result format mysql-test/r/func_system.result: Update to new result format mysql-test/r/isam.result: Update to new result format mysql-test/r/lock.result: Update to new result format mysql-test/r/lock_multi.result: Update to new result format mysql-test/r/rename.result: Update to new result format mysql-test/r/rpl000001.result: Fix wrong test mysql-test/r/tablelock.result: Update to new result format mysql-test/t/rename.test: Update to new result format sql/share/czech/errmsg.txt: Made error messages more general sql/share/danish/errmsg.txt: Made error messages more general sql/share/dutch/errmsg.txt: Made error messages more general sql/share/english/errmsg.txt: Made error messages more general sql/share/estonian/errmsg.txt: Made error messages more general sql/share/french/errmsg.txt: Made error messages more general sql/share/german/errmsg.txt: Made error messages more general sql/share/greek/errmsg.txt: Made error messages more general sql/share/hungarian/errmsg.txt: Made error messages more general sql/share/italian/errmsg.txt: Made error messages more general sql/share/japanese/errmsg.txt: Made error messages more general sql/share/korean/errmsg.txt: Made error messages more general sql/share/norwegian-ny/errmsg.txt: Made error messages more general sql/share/norwegian/errmsg.txt: Made error messages more general sql/share/polish/errmsg.txt: Made error messages more general sql/share/portuguese/errmsg.txt: Made error messages more general sql/share/romanian/errmsg.txt: Made error messages more general sql/share/russian/errmsg.txt: Made error messages more general sql/share/slovak/errmsg.txt: Made error messages more general sql/share/spanish/errmsg.txt: Made error messages more general sql/share/swedish/errmsg.txt: Made error messages more general sql/share/ukrainian/errmsg.txt: Made error messages more general sql/sql_lex.cc: We can't remove lex->thd because sql_yacc uses it. sql/sql_lex.h: We can't remove lex->thd because sql_yacc uses it. sql/sql_yacc.yy: Cleanup support-files/mysql.spec.sh: Create MySQL-embedded rpm tools/mysqlmanager.c: Fix bug in merge --- client/mysqltest.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/mysqltest.c b/client/mysqltest.c index 2ed981d3133..1374a276231 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1718,7 +1718,7 @@ int parse_args(int argc, char **argv) { switch(c) { case '#': - DBUG_PUSH(optarg ? optarg : "d:t:i:O,/tmp/mysqltest.trace"); + DBUG_PUSH(optarg ? optarg : "d:t:S:i:O,/tmp/mysqltest.trace"); break; case 'v': verbose = 1; @@ -1952,8 +1952,14 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) { if ((q->expected_errno[i] == mysql_errno(mysql))) { - dynstr_append(ds,mysql_error(mysql)); - dynstr_append_mem(ds,"\n",1); + if (i == 0 && q->expected_errno[1] == 0) + { + /* Only log error if there is one possible error */ + dynstr_append(ds,mysql_error(mysql)); + dynstr_append_mem(ds,"\n",1); + } + else + dynstr_append(ds,"Got one of the listed errors\n"); goto end; /* Ok */ } } @@ -2153,8 +2159,6 @@ int main(int argc, char** argv) struct st_query* q; my_bool require_file=0, q_send_flag=0; char save_file[FN_REFLEN]; - mysql_server_init(sizeof(embedded_server_args) / sizeof(char *) - 1, - embedded_server_args, embedded_server_groups); MY_INIT(argv[0]); { DBUG_ENTER("main"); -- cgit v1.2.1