Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace

into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace


client/mysqltest.c:
  Auto merged

client/mysqltest.c

@@ -1147,7 +1147,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)

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