From acf1879938049f2c429d9a4aa7559ec9f495721d Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 12 May 2006 09:13:37 +0200
Subject: [PATCH 1/2] Bug#19709 rpl_tmporary fails on powermacg5  - Don't kill
 the active connection to the server, instead read    the connection id,
 switch connection and kill the first one from there.

mysql-test/r/rpl_temporary.result:
  Update test result
mysql-test/t/rpl_temporary.test:
  Don't kill our own connection to the server as the result code differs depending
  on platform.
---
 mysql-test/r/rpl_temporary.result |  2 --
 mysql-test/t/rpl_temporary.test   | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index 42e7712750c..da85ef5104d 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -109,8 +109,6 @@ create temporary table t102 (id int);
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
 create table t1(f int);
 insert into t1 values (1);
 select * from t1 /* must be 1 */;
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index facf0d68d2b..7d2222ea79a 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -169,8 +169,18 @@ create temporary table t102 (id int);
 set @session.pseudo_thread_id=200;
 create temporary table t201 (id int);
 create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
-set @con1_id=connection_id();
-kill @con1_id;
+
+#
+# Don't kill our own connection to the server as
+# the result code differs depending on platform.
+#
+# Select the id to kill into a variable of mysqltest
+let $con1_id= `select connection_id()`;
+# Switch connection to avoid killing our own connection
+connection master;
+--disable_query_log
+eval kill $con1_id;
+--enable_query_log
 
 #now do something to show that slave is ok after DROP temp tables
 connection master;

From f7d265a99c7687c5a22e57824f0abefee6ad24a1 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Fri, 12 May 2006 11:00:34 +0200
Subject: [PATCH 2/2] Correct spelling errors

---
 include/sslopt-longopts.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h
index f444a7eb7ce..b0769af10fe 100644
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.h
@@ -39,7 +39,7 @@
    0, 0, 0, 0, 0, 0},
 #ifdef MYSQL_CLIENT
   {"ssl-verify-server-cert", OPT_SSL_VERIFY_SERVER_CERT,
-   "Verify servers \"Common Name\" in it's cert against hostname used when connecting. This option is disabled by default.",
+   "Verify server's \"Common Name\" in its cert against hostname used when connecting. This option is disabled by default.",
    (gptr*) &opt_ssl_verify_server_cert, (gptr*) &opt_ssl_verify_server_cert,
     0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif