2 files changed, 9 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 4a34d65e025..c4e97d0c92b 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -429,15 +429,14 @@ if [ x$SOURCE_DIST = x1 ] ; then
    MYSQL_TEST="$BASEDIR/client/mysqltest"
  fi
  if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then
-   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
+   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
  else
-   MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
+   MYSQL_DUMP="$BASEDIR/client/mysqldump"
  fi
  if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then
-   MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog --no-defaults --local-load=$MYSQL_TMP_DIR"
+   MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog"
  else
-   MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog --no-defaults --local-load=$MYSQL_TMP_DIR"
- fi
+   MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog"
  if [ -n "$STRACE_CLIENT" ]; then
   MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
  fi
@@ -459,8 +458,8 @@ else
    MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
  fi
  MYSQL_TEST="$BASEDIR/bin/mysqltest"
- MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK"
- MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog --no-defaults --local-load=$MYSQL_TMP_DIR"
+ MYSQL_DUMP="$BASEDIR/bin/mysqldump"
+ MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog"
  MYSQLADMIN="$BASEDIR/bin/mysqladmin"
  WAIT_PID="$BASEDIR/bin/mysql_waitpid"
  MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
@@ -478,6 +477,8 @@ else
   fi
 fi
 
+MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK"
+MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR"
 export MYSQL_DUMP
 export MYSQL_BINLOG
 
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 06ddd5e2280..8eff870e855 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -86,7 +86,7 @@ Field	Type	Null	Key	Default	Extra
 x	varchar(50)	YES		NULL	
 describe t2;
 Field	Type	Null	Key	Default	Extra
-x	char(50)	YES		NULL	
+x	varchar(50)	YES		NULL	
 drop table t2;
 create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f;
 describe t2;