Fixes after merge

mysql-test/std_data/trunc_binlog.000001:
  Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
client/mysqltest.c:
  Fixed merge problem
mysql-test/mysql-test-run.sh:
  Fixed merge problem
mysql-test/r/distinct.result:
  Fix after merge
mysql-test/r/drop_temp_table.result:
  Fix after merge
mysql-test/r/join_outer.result:
  Fix after merge
mysql-test/r/mysqldump.result:
  Fix after merge
mysql-test/r/null_key.result:
  Fix after merge
mysql-test/r/order_by.result:
  Fix after merge
mysql-test/r/rpl_alter.result:
  Fix after merge
mysql-test/r/rpl_loaddata.result:
  Fix after merge
mysql-test/r/rpl_loaddata_rule_m.result:
  Fix after merge
mysql-test/r/rpl_trunc_binlog.result:
  Fix after merge
mysql-test/r/select_safe.result:
  Fix after merge
mysql-test/t/insert.test:
  Fix after merge
mysql-test/t/mysqlbinlog.test:
  Fix after merge
mysql-test/t/rpl000009.test:
  Fix after merge
mysql-test/t/rpl_alter.test:
  Fix after merge
mysql-test/t/rpl_loaddata_rule_m.test:
  Fix after merge
mysql-test/t/rpl_trunc_binlog.test:
  Fix after merge
sql-common/client.c:
  Fix after merge
sql/item_subselect.cc:
  Fix after merge
sql/repl_failsafe.cc:
  Fix after merge
sql/slave.cc:
  Fix after merge
sql/sql_insert.cc:
  Fix after merge

1 files changed, 4 insertions, 5 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 479c368aaa1..6a7f4ab7cac 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -125,6 +125,7 @@ static int block_stack[BLOCK_STACK_DEPTH];
 
 static int block_ok_stack[BLOCK_STACK_DEPTH];
 static uint global_expected_errno[MAX_EXPECTED_ERRORS], global_expected_errors;
+static CHARSET_INFO *charset_info= &my_charset_latin1;
 
 static int embedded_server_arg_count=0;
 static char *embedded_server_args[MAX_SERVER_ARGS];
@@ -716,7 +717,7 @@ int do_wait_for_slave_to_stop(struct st_query* q __attribute__((unused)))
   MYSQL* mysql = &cur_con->mysql;
   for (;;)
   {
-    MYSQL_RES* res;
+    MYSQL_RES *res;
     MYSQL_ROW row;
     int done;
     LINT_INIT(res);
@@ -770,9 +771,7 @@ int do_server_op(struct st_query* q,const char* op)
   if (!*p)
     die("Missing server name in server_%s\n",op);
   while (*p && !my_isspace(charset_info,*p))
-  {
-   *com_p++=*p++;
-  }
+   *com_p++= *p++;
   *com_p++=' ';
   com_p=int10_to_str(manager_wait_timeout,com_p,10);
   *com_p++ = '\n';
@@ -864,7 +863,7 @@ int do_exec(struct st_query* q)
   FILE *res_file;
   char *cmd= q->first_argument;
 
-  while (*cmd && isspace(*cmd))
+  while (*cmd && my_isspace(charset_info, *cmd))
     cmd++;
   if (!*cmd)
     die("Missing argument in exec\n");