List:Commits« Previous MessageNext Message »
From:tomas Date:January 13 2006 4:44pm
Subject:bk commit into 5.1 tree (tomas:1.2054)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2054 06/01/13 17:44:37 tomas@stripped +2 -0
      fix compile error on hp-ux setenv->putenv
     print slave port as well

  mysql-test/mysql-test-run.sh
    1.287 06/01/13 17:44:28 tomas@stripped +6 -5
    print slave port as well

  client/mysqltest.c
    1.174 06/01/13 17:44:28 tomas@stripped +8 -4
    fix compile error on hp-ux setenv->putenv

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.286/mysql-test/mysql-test-run.sh	2006-01-12 19:50:29 +01:00
+++ 1.287/mysql-test/mysql-test-run.sh	2006-01-13 17:44:28 +01:00
@@ -245,11 +245,12 @@
   SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
   NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`
 
-  echo "Using MTR_BUILD_THREAD   = $MTR_BUILD_THREAD"
-  echo "Using MASTER_MYPORT      = $MASTER_MYPORT"
-  echo "Using MYSQL_MANAGER_PORT = $MYSQL_MANAGER_PORT"
-  echo "Using SLAVE_MYPORT       = $SLAVE_MYPORT"
-  echo "Using NDBCLUSTER_PORT    = $NDBCLUSTER_PORT"
+  echo "Using MTR_BUILD_THREAD      = $MTR_BUILD_THREAD"
+  echo "Using MASTER_MYPORT         = $MASTER_MYPORT"
+  echo "Using MYSQL_MANAGER_PORT    = $MYSQL_MANAGER_PORT"
+  echo "Using SLAVE_MYPORT          = $SLAVE_MYPORT"
+  echo "Using NDBCLUSTER_PORT       = $NDBCLUSTER_PORT"
+  echo "Using NDBCLUSTER_PORT_SLAVE = $NDBCLUSTER_PORT_SLAVE"
 fi
 
 NO_SLAVE=0

--- 1.173/client/mysqltest.c	2006-01-12 19:50:29 +01:00
+++ 1.174/client/mysqltest.c	2006-01-13 17:44:28 +01:00
@@ -273,6 +273,7 @@
   int alloced_len;
   int int_dirty; /* do not update string if int is updated until first read */
   int alloced;
+  char *env_s;
 } VAR;
 
 #if defined(__NETWARE__) || defined(__WIN__)
@@ -885,16 +886,18 @@
 
   if (env_var)
   {
-    char buf[1024];
-    memcpy(buf, v->name, v->name_len);
-    buf[v->name_len]= 0;
+    char buf[1024], *old_env_s= v->env_s;
     if (v->int_dirty)
     {
       sprintf(v->str_val, "%d", v->int_val);
       v->int_dirty= 0;
       v->str_val_len= strlen(v->str_val);
     }
-    setenv(buf, v->str_val, 1);
+    strxmov(buf, v->name, "=", v->str_val, NullS);
+    if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))
+      die("Out of memory");
+    putenv(v->env_s);
+    my_free((gptr)old_env_s, MYF(MY_ALLOW_ZERO_PTR));
   }
   DBUG_RETURN(result);
 }
@@ -4335,6 +4338,7 @@
   tmp_var->alloced_len = val_alloc_len;
   tmp_var->int_val = (val) ? atoi(val) : 0;
   tmp_var->int_dirty = 0;
+  tmp_var->env_s = 0;
   return tmp_var;
 }
 
Thread
bk commit into 5.1 tree (tomas:1.2054)tomas13 Jan