bk commit into 5.1 tree (cmiller:1.2353)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2353 06/04/14 13:33:02 cmiller@zippy.(none) +2 -0
  Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
  into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

  mysql-test/t/mysql.test
    1.10 06/04/14 13:32:57 cmiller@zippy.(none) +0 -0
    Auto merged

  client/mysql.cc
    1.200 06/04/14 13:32:57 cmiller@zippy.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new/RESYNC

--- 1.199/client/mysql.cc	2006-04-04 17:35:03 -04:00
+++ 1.200/client/mysql.cc	2006-04-14 13:32:57 -04:00
@@ -3233,10 +3233,9 @@
       mysql_free_result(result);
     } 
 #ifdef HAVE_OPENSSL
-    if (mysql.net.vio && mysql.net.vio->ssl_arg &&
-	SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg))
+    if ((status= mysql_get_ssl_cipher(&mysql)))
       tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
-		  SSL_get_cipher((SSL*) mysql.net.vio->ssl_arg));
+		  status);
     else
 #endif /* HAVE_OPENSSL */
       tee_puts("SSL:\t\t\tNot in use", stdout);

--- 1.9/mysql-test/t/mysql.test	2006-03-07 14:00:41 -05:00
+++ 1.10/mysql-test/t/mysql.test	2006-04-14 13:32:57 -04:00
@@ -61,3 +61,9 @@
 # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".
 #
 --exec $MYSQL -t test -e "create table t1 (col1 binary(4), col2 varchar(10), col3 int); insert into t1 values ('a', 'b', 123421),('a ', '0123456789', 4), ('abcd', '', 4); select concat('>',col1,'<'), col2, col3 from t1; drop table t1;" 2>&1
+
+#
+# Bug#18265 -- mysql client: No longer right-justifies numeric columns
+#
+--exec $MYSQL -t --default-character-set utf8 test -e "create table t1 (i int, j int, k char(25) charset utf8); insert into t1 (i) values (1); insert into t1 (k) values ('<----------------------->'); insert into t1 (k) values ('<-----'); insert into t1 (k) values ('Τη γλώσσα'); insert into t1 (k) values ('ᛖᚴ ᚷᛖᛏ'); select * from t1; DROP TABLE t1;"
+