diff options
| author | unknown <joreland@mysql.com> | 2005-02-21 13:53:48 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-21 13:53:48 +0100 |
| commit | 2defff05c067e26652e73c31cd75531d0f00b014 (patch) | |
| tree | 7f3e74a3e7e08c3f99d81e0751f0eb0dcf743bc9 | |
| parent | f092e1a2cbda317cf35253351f2431dba0c32d43 (diff) | |
| parent | e8f888a52593988b642046c162edca6e45270f57 (diff) | |
| download | mariadb-git-2defff05c067e26652e73c31cd75531d0f00b014.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
| -rw-r--r-- | client/mysql.cc | 4 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 635973e946c..4004757359b 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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); diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 7a6e052f5c7..70eff2db79b 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -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 |