Commit 2defff05 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents f092e1a2 e8f888a5

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -2914,9 +2914,9 @@ com_status(String *buffer __attribute__((unused)), 
    MYSQL_ROW cur=mysql_fetch_row(result);

    if (cur)

    {

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : "");

      tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[2] : "");

      tee_fprintf(stdout, "Db     characterset:\t%s\n", cur[3] ? cur[3] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : "");

      tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[0] : "");

      tee_fprintf(stdout, "Conn.  characterset:\t%s\n", cur[1] ? cur[1] : "");

    }

    mysql_free_result(result);

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ if [ x$NDBCLUSTER = x1 ]; then 
  $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.

  $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.

  $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.

  $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/lib/.

  $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include

  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1

  rm -rf $BASE/ndb-stage

fi