From ae174fbef80a06490fd5ef52517f687e5f33733c Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Mon, 20 Feb 2006 12:05:45 +0100 Subject: [PATCH 1/2] Fix typo --- client/mysqltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 0ff8667a7de..6bf361c17aa 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1088,7 +1088,7 @@ static void do_exec(struct st_query *query) do_eval(&ds_cmd, cmd); cmd= ds_cmd.str; - DBUG_PRINT("info", ("Executing '%' as '%s'", + DBUG_PRINT("info", ("Executing '%s' as '%s'", query->first_argument, cmd)); if (!(res_file= popen(cmd, "r")) && query->abort_on_error) From 1119defd8fcd21b9b9a1742f5c8397c1f4f52805 Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Mon, 20 Feb 2006 15:03:16 +0100 Subject: [PATCH 2/2] Escape \ in "exec" --- mysql-test/t/ndb_config.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test index e40e89d76bd..4787abe86e2 100644 --- a/mysql-test/t/ndb_config.test +++ b/mysql-test/t/ndb_config.test @@ -4,7 +4,7 @@ --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null ---exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null +--exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null --exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null