bk commit into 5.1 tree (msvensson:1.2382)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-12-22 00:39:08+01:00, msvensson@stripped +5 -0
  Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2359.30

  include/mysql_h.ic@stripped, 2006-12-22 00:39:04+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.5

  mysql-test/t/mysqltest.test@stripped, 2006-12-22 00:39:05+01:00, msvensson@stripped
+0 -0
    Auto merged
    MERGE: 1.24.1.26

  mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-22 00:39:05+01:00,
msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.3

  mysql-test/t/trigger.test@stripped, 2006-12-22 00:39:05+01:00, msvensson@stripped +0
-0
    Auto merged
    MERGE: 1.34.1.23

  vio/viossl.c@stripped, 2006-12-22 00:39:05+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.34.2.5

# 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:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.58/mysql-test/t/trigger.test	2006-11-30 00:10:44 +01:00
+++ 1.59/mysql-test/t/trigger.test	2006-12-22 00:39:05 +01:00
@@ -1,3 +1,7 @@
+# This test uses chmod, can't be run with root permissions
+-- source include/not_as_root.inc
+
+
 #
 # Basic triggers test
 #
@@ -1138,8 +1142,10 @@
        event_object_table, action_statement from information_schema.triggers
        where event_object_schema = 'test';
 # Trick which makes update of second .TRN file impossible
-system echo dummy >$MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-system chmod 000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+write_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+dummy
+EOF
+chmod 0000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
 --error 1
 rename table t1 to t2;
 # 't1' should be still there and triggers should work correctly
@@ -1148,8 +1154,8 @@
 select trigger_schema, trigger_name, event_object_schema,
        event_object_table, action_statement from information_schema.triggers
        where event_object_schema = 'test';
-system chmod 600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-system rm $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+chmod 0600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+remove_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
 # Let us check that updates to .TRN files were rolled back too
 drop trigger t1_bi;
 drop trigger t1_ai;

--- 1.61/mysql-test/t/mysqltest.test	2006-11-30 11:30:17 +01:00
+++ 1.62/mysql-test/t/mysqltest.test	2006-12-22 00:39:05 +01:00
@@ -1,6 +1,9 @@
 # This test should work in embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
 
+# This test uses chmod, can't be run with root permissions
+-- source include/not_as_root.inc
+
 # ============================================================================
 #
 # Test of mysqltest itself

--- 1.67/mysql-test/t/rpl_rotate_logs.test	2006-08-30 09:22:41 +02:00
+++ 1.68/mysql-test/t/rpl_rotate_logs.test	2006-12-22 00:39:05 +01:00
@@ -20,8 +20,10 @@
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
-system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
-system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
+# Create empty file
+write_file $MYSQLTEST_VARDIR/slave-data/master.info;
+EOF
+chmod 0000 $MYSQLTEST_VARDIR/slave-data/master.info;
 connection slave;
 --disable_warnings
 drop table if exists t1, t2, t3, t4;
@@ -32,7 +34,7 @@
 --replace_result $MYSQL_TEST_DIR TESTDIR
 --error 1105,1105,29
 start slave;
-system chmod 600  $MYSQLTEST_VARDIR/slave-data/master.info;
+chmod 0600  $MYSQLTEST_VARDIR/slave-data/master.info;
 # It will fail again because the file is empty so the slave cannot get valuable
 # info about how to connect to the master from it (failure in
 # init_strvar_from_file() in init_master_info()).

--- 1.41/vio/viossl.c	2006-11-21 22:15:41 +01:00
+++ 1.42/vio/viossl.c	2006-12-22 00:39:05 +01:00
@@ -126,12 +126,16 @@
   {
     switch ((r= SSL_shutdown(ssl)))
     {
-    case 1: /* Shutdown successful */
+    case 1:
+      /* Shutdown successful */
+      break;
+    case 0:
+      /*
+        Shutdown not yet finished - since the socket is going to
+        be closed there is no need to call SSL_shutdown() a second
+        time to wait for the other side to respond
+      */
       break;
-    case 0: /* Shutdown not yet finished, call it again */
-      if ((r= SSL_shutdown(ssl) >= 0))
-        break;
-      /* Fallthrough */
     default: /* Shutdown failed */
       DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
                                SSL_get_error(ssl, r)));